diff -r ee4d271eef9b -r 3455e79a14af doc/contributions.txt
--- a/doc/contributions.txt	Tue Apr 12 20:38:04 2011 -0400
+++ b/doc/contributions.txt	Thu Apr 14 08:11:06 2011 -0400
@@ -820,6 +820,7 @@
 	STORM-844
 	STORM-643
 	STORM-954
+	STORM-1103
 Vadim Bigbear
 	VWR-2681
 Vector Hastings
diff -r ee4d271eef9b -r 3455e79a14af indra/newview/app_settings/settings.xml
--- a/indra/newview/app_settings/settings.xml	Tue Apr 12 20:38:04 2011 -0400
+++ b/indra/newview/app_settings/settings.xml	Thu Apr 14 08:11:06 2011 -0400
@@ -9177,6 +9177,17 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
+    <key>NearbyListShowMap</key>
+    <map>
+      <key>Comment</key>
+      <string>Show/hide map in nearby list</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <integer>1</integer>
+    </map>
     <key>NearbyListShowIcons</key>
     <map>
       <key>Comment</key>
diff -r ee4d271eef9b -r 3455e79a14af indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml
--- a/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml	Tue Apr 12 20:38:04 2011 -0400
+++ b/indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml	Thu Apr 14 08:11:06 2011 -0400
@@ -42,6 +42,14 @@
      function="CheckControl"
      parameter="NearbyListShowIcons" />
   </menu_item_check>
+  <menu_item_check name ="view_map" label="View Map">
+    <menu_item_check.on_check
+      function="CheckControl"
+      parameter="NearbyListShowMap" />
+    <menu_item_check.on_click
+      function="ToggleControl"
+      parameter="NearbyListShowMap" />
+  </menu_item_check>
   <menu_item_separator layout="topleft" />
   <menu_item_call name="show_blocked_list" label="Show Blocked Residents &amp; Objects">
     <menu_item_call.on_click function="SideTray.ShowPanel" userdata="panel_block_list_sidetray" />
diff -r ee4d271eef9b -r 3455e79a14af indra/newview/skins/default/xui/en/panel_people.xml
--- a/indra/newview/skins/default/xui/en/panel_people.xml	Tue Apr 12 20:38:04 2011 -0400
+++ b/indra/newview/skins/default/xui/en/panel_people.xml	Thu Apr 14 08:11:06 2011 -0400
@@ -99,28 +99,35 @@
          name="nearby_panel"
          top="0"
          width="313">
-			<net_map
-			 bg_color="NetMapBackgroundColor"
-			 follows="top|left|right"
-			 layout="topleft"
-			 left="3"
-			 mouse_opaque="false"
-			 name="Net Map"
-			 width="305"
-			 height="140"
-			 top="5"/>
-			<avatar_list
-             allow_select="true"
-             follows="top|left|bottom|right"
-             height="211"
-             ignore_online_status="true"
-             layout="topleft"
-             left="3"
-             multi_select="true"
-             name="avatar_list"
-             top="145"
-             width="306" />
-            <panel
+        <layout_stack orientation="vertical" clip="false" follows="all" layout="topleft" top="0" left="0" height="355" width="313" mouse_opaque="false">
+          <layout_panel layout="topleft" top="0" left="0" height="142" width="313" user_resize="false" mouse_opaque="false" visibility_control="NearbyListShowMap">
+          <net_map
+            bg_color="NetMapBackgroundColor"
+            follows="all"
+            layout="topleft"
+            left="3"
+            mouse_opaque="false"
+            name="Net Map"
+            width="305"
+            height="140"
+            top="4"/>
+          </layout_panel>
+          <layout_panel layout="topleft" height="213" min_height="100" width="313" user_resize="false" mouse_opaque="false">
+          <avatar_list
+            allow_select="true"
+            follows="all"
+            height="211"
+            ignore_online_status="true"
+            layout="topleft"
+            left="3"
+            multi_select="true"
+            keep_one_selected="false"
+            name="avatar_list"
+            top="2"
+            width="306" />
+          </layout_panel>
+        </layout_stack>
+        <panel
              background_visible="true"
              follows="left|right|bottom"
              height="27"