diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp
index 6515da5958..2908fc1527 100644
--- a/indra/newview/llviewerdisplay.cpp
+++ b/indra/newview/llviewerdisplay.cpp
@@ -380,8 +380,11 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			// Transition to REQUESTED.  Viewer has sent some kind
 			// of TeleportRequest to the source simulator
 			gTeleportDisplayTimer.reset();
-			gViewerWindow->setShowProgress(TRUE);
-			gViewerWindow->setProgressPercent(0);
+			if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+			{
+				gViewerWindow->setShowProgress(TRUE);
+				gViewerWindow->setProgressPercent(0);
+			}
 			gAgent.setTeleportState( LLAgent::TELEPORT_REQUESTED );
 			gAgent.setTeleportMessage(
 				LLAgent::sTeleportProgressMessages["requesting"]);
@@ -408,14 +411,17 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot)
 			gAgent.setTeleportMessage(
 				LLAgent::sTeleportProgressMessages["arriving"]);
 			gTextureList.mForceResetTextureStats = TRUE;
-			gAgentCamera.resetView(TRUE, TRUE);
+			if(!gSavedSettings.getBOOL("PhoenixDisableTeleportScreens"))
+			{
+				gAgentCamera.resetView(TRUE, TRUE);
+			}
 			break;
 
 		case LLAgent::TELEPORT_ARRIVING:
 			// Make the user wait while content "pre-caches"
 			{
 				F32 arrival_fraction = (gTeleportArrivalTimer.getElapsedTimeF32() / TELEPORT_ARRIVAL_DELAY);
-				if( arrival_fraction > 1.f )
+				if( arrival_fraction > 1.f || gSavedSettings.getBOOL("PhoenixDisableTeleportScreens") )
 				{
 					arrival_fraction = 1.f;
 					//LLFirstUse::useTeleport();
diff --git a/indra/newview/skins/metaharper/xui/en/floater_stats.xml b/indra/newview/skins/metaharper/xui/en/floater_stats.xml
deleted file mode 100644
index b87cb9a433..0000000000
--- a/indra/newview/skins/metaharper/xui/en/floater_stats.xml
+++ /dev/null
@@ -1,693 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater
- legacy_header_height="18"
- can_resize="true"
- follows="top|right"
- height="400"
- layout="topleft"
- name="Statistics"
- help_topic="statistics"
- save_rect="true"
- save_visibility="true"
- title="STATISTICS"
- width="250">
-    <scroll_container
-     follows="top|left|bottom|right"
-     height="380"
-     layout="topleft"
-     left="0"
-     name="statistics_scroll"
-     reserve_scroll_corner="true"
-     top="20"
-     width="250">
-        <container_view
-         follows="top|left|bottom|right"
-         height="378"
-         layout="topleft"
-         left="2"
-         name="statistics_view"
-         top="20"
-         width="230" >
-		  <stat_view
-			 name="basic"
-			 label="Basic"
-			 show_label="true"
-			 setting="OpenDebugStatBasic">
-			<stat_bar
-			   name="fps"
-			   label="FPS"
-			   unit_label="fps"
-			   stat="fpsstat"
-			   bar_min="0"
-			   bar_max="45"
-			   tick_spacing="7.5"
-			   label_spacing="15.0"
-			   precision="1"
-			   show_bar="true"
-			   show_history="true">
-			</stat_bar>
-			<stat_bar
-			   name="bandwidth"
-			   label="Bandwidth"
-			   unit_label="kbps"
-			   stat="kbitstat"
-			   bar_min="0"
-			   bar_max="900"
-			   tick_spacing="100"
-			   label_spacing="300"
-			   show_bar="true"
-			   show_history="false">
-			</stat_bar>
-			<stat_bar
-			   name="packet_loss"
-			   label="Packet Loss"
-			   unit_label=" %"
-			   stat="packetslostpercentstat"
-			   bar_min="0"
-			   bar_max="5"
-			   tick_spacing="1"
-			   label_spacing="1"
-			   precision="1"
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="true">
-			</stat_bar>
-			<stat_bar
-			   name="ping"
-			   label="Ping Sim"
-			   unit_label="msec"
-			   stat="simpingstat"
-			   bar_min="0"
-			   bar_max="1000"
-			   tick_spacing="100"
-			   label_spacing="200"
-			   show_bar="false"
-			   show_per_sec="false"
-			   show_mean="false">
-			</stat_bar>
-		  </stat_view>
-		  <stat_view
-			 name="advanced"
-			 label="Advanced"
-			 show_label="true"
-			 setting="OpenDebugStatAdvanced">
-			<stat_view
-			   name="render"
-			   label="Render"
-			   show_label="true"
-			   setting="OpenDebugStatRender">
-			  <stat_bar
-				 name="ktrisframe"
-				 label="KTris Drawn"
-				 unit_label="/fr"
-				 stat="trianglesdrawnstat"
-				 bar_min="0"
-				 bar_max="500"
-				 tick_spacing="100"
-				 label_spacing="500"
-				 precision="1"
-				 show_per_sec="false">
-			  </stat_bar>
-			  <stat_bar
-				 name="ktrissec"
-				 label="KTris Drawn"
-				 unit_label="/sec"
-				 stat="trianglesdrawnstat"
-				 bar_min="0"
-				 bar_max="3000"
-				 tick_spacing="250"
-				 label_spacing="1000"
-				 precision="1">
-			  </stat_bar>
-			  <stat_bar
-				 name="objs"
-				 label="Total Objects"
-				 unit_label=""
-				 stat="numobjectsstat"
-				 bar_min="0"
-				 bar_max="3000"
-				 tick_spacing="250"
-				 label_spacing="1000"
-				 precision="1"
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-			  <stat_bar
-				 name="newobjs"
-				 label="New Objects"
-				 unit_label="/sec"
-				 stat="numnewobjectsstat"
-				 bar_min="0"
-				 bar_max="1000"
-				 tick_spacing="100"
-				 label_spacing="500"
-				 show_per_sec="true"
-				 show_bar="false">
-			  </stat_bar>
-			</stat_view>
-			<stat_view
-			   name="texture"
-			   label="Texture"
-			   show_label="true">
-			  <stat_bar
-				 name="numimagesstat"
-				 label="Count"
-				 stat="numimagesstat" 
-				 bar_min="0.f"
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="numrawimagesstat"
-				 label="Raw Count"
-				 stat="numrawimagesstat"
-				 bar_min="0.f"
-				 bar_max="8000.f" 
-				 tick_spacing="2000.f"
-				 label_spacing="4000.f" 
-				 show_per_sec="false"
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="gltexmemstat"
-				 label="GL Mem"
-				 stat="gltexmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="formattedmemstat"
-				 label="Formatted Mem"
-				 stat="formattedmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="rawmemstat"
-				 label="Raw Mem"
-				 stat="rawmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="glboundmemstat"
-				 label="Bound Mem"
-				 stat="glboundmemstat"
-				 bar_min="0.f"
-				 bar_max="400.f" 
-				 tick_spacing="100.f"
-				 label_spacing="200.f" 
-				 precision="1"
-				 show_per_sec="false" >
-			  </stat_bar>
-			</stat_view>
-
-			<stat_view
-			   name="network"
-			   label="Network"
-			   show_label="true"
-			   setting="OpenDebugStatNet">
-			  <stat_bar
-				 name="packetsinstat"
-				 label="Packets In"
-				 stat="packetsinstat"
-				 unit_label="/sec" 
-				 show_bar="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="packetsoutstat"
-				 label="Packets Out"
-				 stat="packetsoutstat"
-				 unit_label="/sec" 
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="objectkbitstat"
-				 label="Objects"
-				 stat="objectkbitstat"
-				 unit_label="kbps"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="texturekbitstat"
-				 label="Texture"
-				 stat="texturekbitstat"
-				 unit_label="kbps"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="assetkbitstat"
-				 label="Asset"
-				 stat="assetkbitstat"
-				 unit_label="kbps"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="layerskbitstat"
-				 label="Layers"
-				 stat="layerskbitstat"
-				 unit_label="kbps"
-				 show_bar="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="actualinkbitstat"
-				 label="Actual In"
-				 stat="actualinkbitstat"
-				 unit_label="kbps"
-				 bar_min="0.f"
-				 bar_max="1024.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 show_bar="true"
-				 show_history="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="actualoutkbitstat"
-				 label="Actual Out"
-				 stat="actualoutkbitstat"
-				 unit_label="kbps"
-				 bar_min="0.f"
-				 bar_max="512.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 show_bar="true"
-				 show_history="false">
-			  </stat_bar>
-
-			  <stat_bar
-				 name="vfspendingoperations"
-				 label="VFS Pending Ops"
-				 stat="vfspendingoperations"
-				 unit_label=" "
-				 show_per_sec="false"
-				 show_bar="false" >
-			  </stat_bar>
-			</stat_view>
-		  </stat_view>
-
-		  <stat_view
-			 name="sim"
-			 label="Simulator"
-			 show_label="true"
-			 setting="OpenDebugStatSim">
-			<stat_bar
-			   name="simtimedilation"
-			   label="Time Dilation"
-			   stat="simtimedilation"
-			   precision="2"
-			   bar_min="0.f"
-			   bar_max="1.f" 
-			   tick_spacing="0.25f"
-			   label_spacing="0.5f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simfps"
-			   label="Sim FPS"
-			   stat="simfps"
-			   bar_min="0.f"
-			   bar_max="200.f" 
-			   tick_spacing="20.f"
-			   label_spacing="100.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simphysicsfps"
-			   label="Physics FPS"
-			   stat="simphysicsfps"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="66.f" 
-			   tick_spacing="33.f"
-			   label_spacing="33.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_view
-			   name="physicsdetail"
-			   label="Physics Details"
-			   show_label="true">
-			  <stat_bar
-				 name="physicspinnedtasks"
-				 label="Pinned Objects"
-				 stat="physicspinnedtasks"
-				 precision="0" 
-				 bar_min="0.f"
-				 bar_max="500.f" 
-				 tick_spacing="10.f"
-				 label_spacing="40.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="physicslodtasks"
-				 label="Low LOD Objects"
-				 stat="physicslodtasks"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="500.f" 
-				 tick_spacing="10.f"
-				 label_spacing="40.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="physicsmemoryallocated"
-				 label="Memory Allocated"
-				 stat="physicsmemoryallocated"
-				 unit_label="MB"
-				 precision="0"
-				 bar_min="0.f"
-				 bar_max="1024.f" 
-				 tick_spacing="128.f"
-				 label_spacing="256.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-		  </stat_view>
-
-			<stat_bar
-			   name="simagentups"
-			   label="Agent Updates/Sec"
-			   stat="simagentups"
-			   precision="1"
-			   bar_min="0.f"
-			   bar_max="100.f" 
-			   tick_spacing="25.f"
-			   label_spacing="50.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simmainagents"
-			   label="Main Agents"
-			   stat="simmainagents"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="80.f" 
-			   tick_spacing="10.f"
-			   label_spacing="40.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simchildagents"
-			   label="Child Agents"
-			   stat="simchildagents"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="40.f" 
-			   tick_spacing="5.f"
-			   label_spacing="10.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simobjects"
-			   label="Objects"
-			   stat="simobjects"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="30000.f" 
-			   tick_spacing="5000.f"
-			   label_spacing="10000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactiveobjects"
-			   label="Active Objects"
-			   stat="simactiveobjects"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="800.f" 
-			   tick_spacing="100.f"
-			   label_spacing="200.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simactivescripts"
-			   label="Active Scripts"
-			   stat="simactivescripts"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="800.f" 
-			   tick_spacing="100.f"
-			   label_spacing="200.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simscripteps"
-			   label="Script Events"
-			   stat="simscripteps"
-			   unit_label="eps"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="20000.f" 
-			   tick_spacing="2500.f"
-			   label_spacing="5000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="siminpps"
-			   label="Packets In"
-			   stat="siminpps"
-			   unit_label="pps"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simoutpps"
-			   label="Packets Out"
-			   stat="simoutpps"
-			   unit_label="pps" 
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="2000.f" 
-			   tick_spacing="250.f"
-			   label_spacing="1000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendingdownloads"
-			   label="Pending Downloads"
-			   stat="simpendingdownloads"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="800.f" 
-			   tick_spacing="100.f"
-			   label_spacing="200.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simpendinguploads"
-			   label="Pending Uploads"
-			   stat="simpendinguploads"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="100.f" 
-			   tick_spacing="25.f"
-			   label_spacing="50.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_bar
-			   name="simtotalunackedbytes"
-			   label="Total Unacked Bytes"
-			   stat="simtotalunackedbytes"
-			   unit_label="kb"
-			   precision="0"
-			   bar_min="0.f"
-			   bar_max="100000.f" 
-			   tick_spacing="25000.f"
-			   label_spacing="50000.f" 
-			   show_per_sec="false"
-			   show_bar="false"
-			   show_mean="false" >
-			</stat_bar>
-
-			<stat_view
-			   name="simperf"
-			   label="Time (ms)"
-			   show_label="true">
-			  <stat_bar
-				 name="simframemsec"
-				 label="Total Frame Time"
-				 stat="simframemsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simnetmsec"
-				 label="Net Time"
-				 stat="simnetmsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimphysicsmsec"
-				 label="Physics Time"
-				 stat="simsimphysicsmsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simsimothermsec"
-				 label="Simulation Time"
-				 stat="simsimothermsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simagentmsec"
-				 label="Agent Time"
-				 stat="simagentmsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simimagesmsec"
-				 label="Images Time"
-				 stat="simimagesmsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-
-			  <stat_bar
-				 name="simscriptmsec"
-				 label="Script Time"
-				 stat="simscriptmsec"
-				 unit_label="ms"
-				 precision="1"
-				 bar_min="0.f"
-				 bar_max="40.f" 
-				 tick_spacing="10.f"
-				 label_spacing="20.f" 
-				 show_per_sec="false"
-				 show_bar="false"
-				 show_mean="false" >
-			  </stat_bar>
-			</stat_view>
-		  </stat_view>
-		</container_view>
-    </scroll_container>
-</floater>
diff --git a/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml b/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
index 9f224d5640..fe1988570c 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_my_profile.xml
@@ -1,325 +1,335 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="all"
- height="532"
- label="Profile"
- layout="topleft"
- left="0"
- name="panel_profile"
- top="0"
- width="313">
-    <string
-     name="CaptionTextAcctInfo">
-        [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
-    </string>
-    <string
-     name="payment_update_link_url">
-        http://www.secondlife.com/account/billing.php?lang=en
-    </string>
-    <string
-     name="partner_edit_link_url">
-        http://www.secondlife.com/account/partners.php?lang=en
-    </string>
-    <string
-     name="my_account_link_url"
-     value="http://secondlife.com/account" />
-    <string
-     name="no_partner_text"
-     value="None" />
-    <string
-     name="no_group_text"
-     value="None" />
-    <string
-	 name="RegisterDateFormat">
-	 [REG_DATE] ([AGE])
-	</string>
-   <accordion
-    left="0"
-    top="0"
-    single_expansion="true"
-    fit_parent="true"
-    follows="all"
-    layout="topleft"
-    name="profile_accordion"
-    height="505"
-    width="313">
-     <accordion_tab
-      expanded="true"
-      layout="topleft"
-      name="second_life_tab"
-      title="Avatar"
-      fit_panel="false">
-        <scroll_container
-         color="SL-Background_66"
-         follows="all"
-         layout="topleft"
-         left="0"
-         name="profile_sl_scroll"
-         opaque="true"
-         height="650"
-         width="313"
-         top="0">
-          <panel
-            layout="topleft"
-            follows="left|top|right"
-            height="650"
-            name="scroll_content_sl_panel"
-            top="0"
-            left="0"
-            width="313">
-              <texture_picker
-               allow_no_texture="true"
-               default_image_name="None"
-               enabled="false"
-               fallback_image="Generic_Person_Large"
-               follows="top|left"
-               height="225"
-               layout="topleft"
-               left="10"
-               name="2nd_life_pic"
-               top="0"
-               width="275" />           
-             <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_sl_text"
-             text_color="white"
-             top_pad="0"
-             value="About:"
-             width="100" />
-              <expandable_text
-               follows="left|top|right"
-               height="240"
-               layout="topleft"
-               left="5"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="sl_description_edit"
-               top_pad="0"
-               allow_scroll="true"
-               translate="false"
-               width="280"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>
-            <text
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="552"
+ label="Profile"
+ layout="topleft"
+ left="0"
+ name="panel_profile"
+ top="0"
+ width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=en
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=en
+    </string>
+    <string
+     name="my_account_link_url"
+     value="http://secondlife.com/account" />
+    <string
+     name="no_partner_text"
+     value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
+	 name="RegisterDateFormat">
+	 [REG_DATE] ([AGE])
+	</string>
+   <accordion
+    left="0"
+    top="0"
+    single_expansion="true"
+    fit_parent="true"
+    follows="all"
+    layout="topleft"
+    name="profile_accordion"
+    height="500"
+    width="313">
+     <accordion_tab
+      expanded="true"
+      layout="topleft"
+      name="second_life_tab"
+      title="Avatar"
+      fit_panel="true">
+        <scroll_container
+         color="SL-Background_66"
+         follows="all"
+         layout="topleft"
+         left="0"
+         name="profile_sl_scroll"
+         opaque="true"
+         height="650"
+         width="331"
+         top="0">
+          <panel
+           layout="topleft"
+           follows="left|top|right"
+           height="800"
+           name="second_life_panel"
+           top="0"
+           left="0"
+           width="313">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               fallback_image="Generic_Person_Large"
+               follows="top|left"
+               height="225"
+               layout="topleft"
+               left="10"
+               name="2nd_life_pic"
+               top="0"
+               width="275" />
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
              left="4"
-             follows="left|top"
-             font.style="BOLD"
-             height="10"
-             layout="topleft"
+             name="About_sl_text"
+             text_color="White"
+             top_pad="0"
+             value="About:"
+             width="280" />
+            <expandable_text
+               allow_scroll="true"
+               follows="left|top|right"
+               height="240"
+               layout="topleft"
+               left="5"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="sl_description_edit"
+               top_pad="3"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            <text
+             left="4"
+             follows="left|top"
+             font.style="BOLD"
+             height="10"
+             layout="topleft"
              left_pad="0"
-             top_pad="0"
-             name="title_member_text"
-             text_color="white"
-             top_delta="0"
-             value="Resident Since:"
-             width="280" />
-            <text_editor
-             allow_scroll="false"
-             bg_visible="false"
-             follows="left|top"
-             h_pad="0"
-             height="15"
-             layout="topleft"
-             name="register_date"
-             read_only="true"
-             translate="false"
-             v_pad="0"
-             value="05/31/2376"
-             width="280"
+             top_pad="0"
+             name="title_member_text"
+             text_color="White"
+             top_delta="0"
+             value="Resident Since:"
+             width="280" />
+            <text_editor
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top"
+             h_pad="0"
+             height="15"
+             layout="topleft"
+             name="register_date"
+             read_only="true"
+             translate="false"
+             v_pad="0"
+             value="05/31/2376"
+             width="280"
              word_wrap="true" />
             <text
-             follows="left|top"
-             font.style="BOLD"
-             height="15"
-             layout="topleft"
-             name="title_acc_status_text"
-             text_color="white"
-             top_pad="12"
-             value="Account Status:"
-             width="280"
-             word_wrap="true" /> 
-            <text_editor
-             allow_scroll="false"
-             bg_visible="false"
-             follows="left|top"
-             h_pad="0"
-             height="42"
-             layout="topleft"
-             name="acc_status_text"
-             read_only="true"
-             translate="false"
-             top_pad="-2"
-             v_pad="0"
-             width="280"
-             word_wrap="true">
-              Resident. No payment info on file.
-              Linden.
-            </text_editor>
-            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="15"
+             layout="topleft"
+             name="title_acc_status_text"
+             text_color="white"
+             top_pad="12"
+             value="Account Status:"
+             width="280"
+             word_wrap="true" />
+            <text_editor
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top"
+             h_pad="0"
+             height="42"
+             layout="topleft"
+             name="acc_status_text"
+             read_only="true"
+             translate="false"
+             top_pad="-2"
+             v_pad="0"
+             width="280"
+             word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text_editor>
+            <text
              left="4"
-             follows="left|top"
-             font.style="BOLD"
-             height="15"
-             layout="topleft"
-             name="title_partner_text"
-             text_color="white"
-             top_pad="0"
-             value="Partner:"
-             width="280" />
-            <panel
-             follows="left|top"
-             height="30"
-             layout="topleft"
-             name="partner_data_panel"
-             top_pad="-2"
-             width="120">
-              <text
-               follows="left|top"
-               height="10"
-               initial_value="(retrieving)"
-               layout="topleft"
-               left="0"
-               link="true"
-               name="partner_text"
-               top="0"
-               use_ellipses="true" 
-               width="300" />
-            </panel>
-
-            <!--
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="title_my_groups_text"
-             text_color="white"
-             top_pad="3"
-             value="Groups:"
-             width="290" />
-            -->
-            <expandable_text
-            follows="all"
-            height="150"
-            layout="topleft"
-            left="5"
-            name="sl_groups"
-            textbox.max_length="512"
-            textbox.show_context_menu="true"
-            top_pad="0"
-            translate="false"
-            width="280"
-            expanded_bg_visible="true"
-            expanded_bg_color="SL-Background_Light">
-              Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-            </expandable_text>     
-          </panel>        
-        </scroll_container>
-      </accordion_tab>
-    <accordion_tab
-     expanded="false"
-     layout="topleft"
-     name="real_world_tab"
-     title="More Info"
-     fit_panel="false">
-        <scroll_container
-         color="SL-Background_66"
-         follows="all"
-         layout="topleft"
-         left="0"
-         name="profile_rl_scroll"
-         opaque="true"
-         height="650"
-         width="313"
-         top="0">
-           <panel
-            layout="topleft"
-            follows="left|top|right"
-            height="650"
-            name="profile_rl_scroll_panel"
-            top="0"
-            left="0"
-            width="313">
-              <texture_picker
-               allow_no_texture="true"
-               default_image_name="None"
-               enabled="false"
-               fallback_image="Generic_Person_Large"
-               follows="top|left"
-               height="225"
-               layout="topleft"
-               left="10"
-               name="real_world_pic"
-               top="0"
-               width="275" />
-              <expandable_text
+             follows="left|top"
+             font.style="BOLD"
+             height="15"
+             layout="topleft"
+             name="title_partner_text"
+             text_color="White"
+             top_pad="0"
+             value="Partner:"
+             width="280" />
+            <panel
+             follows="left|top"
+             height="30"
+             layout="topleft"
+             name="partner_data_panel"
+             top_pad="-2"
+             width="120">
+              <text
+               follows="left|top"
+               height="10"
+               initial_value="(retrieving)"
+               layout="topleft"
+               left="0"
+               link="true"
+               name="partner_text"
+               top="0"
+               use_ellipses="true"
+		       width="300" />
+            </panel>
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="title_groups_text"
+             text_color="White"
+             top_pad="0"
+             value="Groups:"
+             width="280" />
+			<group_list
+			 for_agent="true"
+			 allow_select="true"
+             height="162"
+             follows="all"
+			 left="5"
+			 name="group_list"
+             top_pad="0"
+			 width="280" />
+<!--
+            <expandable_text
+            follows="all"
+            height="160"
+            layout="topleft"
+            left="5"
+            name="sl_groups"
+            textbox.max_length="512"
+            textbox.show_context_menu="true"
+            top_pad="0"
+            translate="false"
+            width="280"
+            expanded_bg_visible="true"
+            word_wrap="true"
+            allow_scroll="false"
+            expanded_bg_color="SL-Background_Light">
+              Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
+            </expandable_text>
+-->
+          </panel>
+        </scroll_container>
+    </accordion_tab>
+    <accordion_tab
+     expanded="false"
+     layout="topleft"
+     name="real_world_tab"
+     title="More Info"
+     fit_panel="false">
+        <scroll_container
+         color="SL-Background_66"
+         follows="all"
+         layout="topleft"
+         left="0"
+         name="profile_rl_scroll"
+         opaque="true"
+         height="650"
+         width="313"
+         top="0">
+           <panel
+            layout="topleft"
+            follows="left|top|right"
+            height="650"
+            name="profile_rl_scroll_panel"
+            top="0"
+            left="0"
+            width="313">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               fallback_image="Generic_Person_Large"
+               follows="top|left"
+               height="225"
+               layout="topleft"
+               left="10"
+               name="real_world_pic"
+               top="0"
+               width="275" />
+              <expandable_text
                follows="left|top|right"
-               allow_scroll="false"
-               height="240"
-               layout="topleft"
-               left="5"
-               top_pad="-3"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="fl_description_edit"
-               translate="false"
-               width="280"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="homepage_text"
-             text_color="white"
-             top_pad="3"
-             value="Web page:"
-             width="280" />
-              <text
-              follows="left|top"
-              height="15"
-              layout="topleft"
-              left="4"
-              name="homepage_edit"
-              top_pad="2"
-              translate="false"
-              value="blank"
-              width="280"
-              word_wrap="false"
-              use_ellipses="true" />
-            </panel>
-        </scroll_container>
-      </accordion_tab>
-    </accordion>
- 	<panel
-     follows="bottom|left|right"
-     height="23"
-     layout="topleft"
-     left="0"
-     top_pad="1"
-     name="profile_me_buttons_panel"
-     visible="false"
-     width="315">
-        <button
-         follows="bottom"
-         height="23"
-         left="6"
-	 	 top="1"
-         label="Edit Profile"
-         name="edit_profile_btn"
-         tool_tip="Edit your personal information"
-         width="152" />
- 	</panel>
-</panel>
+               allow_scroll="false"
+               height="240"
+               layout="topleft"
+               left="5"
+               top_pad="-3"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="fl_description_edit"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="homepage_text"
+             text_color="White"
+             top_pad="3"
+             value="Web page:"
+             width="280" />
+              <text
+              follows="left|top"
+              height="15"
+              layout="topleft"
+              left="4"
+              name="homepage_edit"
+              top_pad="2"
+              translate="false"
+              value="blank"
+              width="280"
+              word_wrap="false"
+              use_ellipses="true" />
+          </panel>
+        </scroll_container>
+      </accordion_tab>
+    </accordion>
+ 	<panel
+     follows="bottom|left|right"
+     height="23"
+     layout="topleft"
+     left="0"
+     top_pad="1"
+     name="profile_me_buttons_panel"
+     visible="false"
+     width="315">
+        <button
+         follows="bottom"
+         height="23"
+         left="6"
+	 	 top="1"
+         label="Edit Profile"
+         name="edit_profile_btn"
+         tool_tip="Edit your personal information"
+         width="152" />
+ 	</panel>
+</panel>
diff --git a/indra/newview/skins/metaharper/xui/en/panel_profile.xml b/indra/newview/skins/metaharper/xui/en/panel_profile.xml
index b76c995074..112bac2637 100644
--- a/indra/newview/skins/metaharper/xui/en/panel_profile.xml
+++ b/indra/newview/skins/metaharper/xui/en/panel_profile.xml
@@ -1,197 +1,196 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- follows="all"
- height="552"
- label="Profile"
- layout="topleft"
- left="0"
- name="panel_profile"
- top="0"
- width="313">
-    <string
-     name="CaptionTextAcctInfo">
-        [ACCTTYPE]
-[PAYMENTINFO] [AGEVERIFICATION]
-    </string>
-    <string
-     name="payment_update_link_url">
-        http://www.secondlife.com/account/billing.php?lang=en
-    </string>
-    <string
-     name="partner_edit_link_url">
-        http://www.secondlife.com/account/partners.php?lang=en
-    </string>
-    <string
-     name="my_account_link_url"
-     value="http://secondlife.com/account" />
-    <string
-     name="no_partner_text"
-     value="None" />
-    <string
-     name="no_group_text"
-     value="None" />
-    <string
-	 name="RegisterDateFormat">
-	 [REG_DATE] ([AGE])
-	</string>
-   <accordion
-    left="0"
-    top="0"
-    single_expansion="true"
-    fit_parent="true"
-    follows="all"
-    layout="topleft"
-    name="profile_accordion"
-    height="500"
-    width="313">
-     <accordion_tab
-      expanded="true"
-      layout="topleft"
-      name="second_life_tab"
-      title="Avatar"
-      fit_panel="true">
-        <scroll_container
-         color="SL-Background_66"
-         follows="all"
-         layout="topleft"
-         left="0"
-         name="profile_sl_scroll"
-         opaque="true"
-         height="650"
-         width="331"
-         top="0">
-          <panel
-           layout="topleft"
-           follows="left|top|right"
-           height="750"
-           name="second_life_panel"
-           top="0"
-           left="0"
-           width="313">
-              <texture_picker
-               allow_no_texture="true"
-               default_image_name="None"
-               enabled="false"
-               fallback_image="Generic_Person_Large"
-               follows="top|left"
-               height="225"
-               layout="topleft"
-               left="10"
-               name="2nd_life_pic"
-               top="0"
-               width="275" />
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="About_sl_text"
-             text_color="White"
-             top_pad="0"
-             value="About:"
-             width="280" />
-            <expandable_text
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<panel
+ follows="all"
+ height="552"
+ label="Profile"
+ layout="topleft"
+ left="0"
+ name="panel_profile"
+ top="0"
+ width="313">
+    <string
+     name="CaptionTextAcctInfo">
+        [ACCTTYPE]
+[PAYMENTINFO] [AGEVERIFICATION]
+    </string>
+    <string
+     name="payment_update_link_url">
+        http://www.secondlife.com/account/billing.php?lang=en
+    </string>
+    <string
+     name="partner_edit_link_url">
+        http://www.secondlife.com/account/partners.php?lang=en
+    </string>
+    <string
+     name="my_account_link_url"
+     value="http://secondlife.com/account" />
+    <string
+     name="no_partner_text"
+     value="None" />
+    <string
+     name="no_group_text"
+     value="None" />
+    <string
+	 name="RegisterDateFormat">
+	 [REG_DATE] ([AGE])
+	</string>
+   <accordion
+    left="0"
+    top="0"
+    single_expansion="true"
+    fit_parent="true"
+    follows="all"
+    layout="topleft"
+    name="profile_accordion"
+    height="500"
+    width="313">
+     <accordion_tab
+      expanded="true"
+      layout="topleft"
+      name="second_life_tab"
+      title="Avatar"
+      fit_panel="true">
+        <scroll_container
+         color="SL-Background_66"
+         follows="all"
+         layout="topleft"
+         left="0"
+         name="profile_sl_scroll"
+         opaque="true"
+         height="650"
+         width="331"
+         top="0">
+          <panel
+           layout="topleft"
+           follows="left|top|right"
+           height="800"
+           name="second_life_panel"
+           top="0"
+           left="0"
+           width="313">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               fallback_image="Generic_Person_Large"
+               follows="top|left"
+               height="225"
+               layout="topleft"
+               left="10"
+               name="2nd_life_pic"
+               top="0"
+               width="275" />
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="About_sl_text"
+             text_color="White"
+             top_pad="0"
+             value="About:"
+             width="280" />
+            <expandable_text
                allow_scroll="true"
-               follows="left|top|right"
-               height="240"
-               layout="topleft"
-               left="5"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="sl_description_edit"
-               top_pad="3"
-               translate="false"
-               width="280"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>              
+               follows="left|top|right"
+               height="240"
+               layout="topleft"
+               left="5"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="sl_description_edit"
+               top_pad="3"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
             <text
-             left="4"
-             follows="left|top"
-             font.style="BOLD"
-             height="10"
-             layout="topleft"
+             left="4"
+             follows="left|top"
+             font.style="BOLD"
+             height="10"
+             layout="topleft"
              left_pad="0"
-             top_pad="0"
-             name="title_member_text"
-             text_color="White"
-             top_delta="0"
-             value="Resident Since:"
-             width="280" />
-            <text_editor
-             allow_scroll="false"
-             bg_visible="false"
-             follows="left|top"
-             h_pad="0"
-             height="15"
-             layout="topleft"
-             name="register_date"
-             read_only="true"
-             translate="false"
-             v_pad="0"
-             value="05/31/2376"
-             width="280"
-             word_wrap="true" />
+             top_pad="0"
+             name="title_member_text"
+             text_color="White"
+             top_delta="0"
+             value="Resident Since:"
+             width="280" />
+            <text_editor
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top"
+             h_pad="0"
+             height="15"
+             layout="topleft"
+             name="register_date"
+             read_only="true"
+             translate="false"
+             v_pad="0"
+             value="05/31/2376"
+             width="280"
+             word_wrap="true" />
             <text
-             left="4"
-             follows="left|top"
-             font.style="BOLD"
-             height="15"
-             layout="topleft"
-             name="title_acc_status_text"
-             text_color="White"
-             top_pad="12"
-             value="Account Status:"
-             width="280"
-             word_wrap="true" />
-            <text_editor
-             allow_scroll="false"
-             bg_visible="false"
-             follows="left|top"
-             h_pad="0"
-             height="42"
-             layout="topleft"
-             name="acc_status_text"
-             read_only="true"
-             translate="false"
-             top_pad="-2"
-             v_pad="0"
-             width="280"
-             word_wrap="true">
-              Resident. No payment info on file.
-              Linden.
-            </text_editor>
+             follows="left|top"
+             font.style="BOLD"
+             height="15"
+             layout="topleft"
+             name="title_acc_status_text"
+             text_color="white"
+             top_pad="12"
+             value="Account Status:"
+             width="280"
+             word_wrap="true" />
+            <text_editor
+             allow_scroll="false"
+             bg_visible="false"
+             follows="left|top"
+             h_pad="0"
+             height="42"
+             layout="topleft"
+             name="acc_status_text"
+             read_only="true"
+             translate="false"
+             top_pad="-2"
+             v_pad="0"
+             width="280"
+             word_wrap="true">
+              Resident. No payment info on file.
+              Linden.
+            </text_editor>
             <text
-             left="4"
-             follows="left|top"
-             font.style="BOLD"
-             height="15"
-             layout="topleft"
-             name="title_partner_text"
-             text_color="White"
-             top_pad="0"
-             value="Partner:"
-             width="280" />
-            <panel
-             follows="left|top"
-             height="30"
-             layout="topleft"
-             name="partner_data_panel"
-             top_pad="-2"
-             width="120">
-              <text
-               follows="left|top"
-               height="10"
-               initial_value="(retrieving)"
-               layout="topleft"
-               left="0"
-               link="true"
-               name="partner_text"
-               top="0"
-               use_ellipses="true"
-           width="300" />
+             left="4"
+             follows="left|top"
+             font.style="BOLD"
+             height="15"
+             layout="topleft"
+             name="title_partner_text"
+             text_color="White"
+             top_pad="0"
+             value="Partner:"
+             width="280" />
+            <panel
+             follows="left|top"
+             height="30"
+             layout="topleft"
+             name="partner_data_panel"
+             top_pad="-2"
+             width="120">
+              <text
+               follows="left|top"
+               height="10"
+               initial_value="(retrieving)"
+               layout="topleft"
+               left="0"
+               link="true"
+               name="partner_text"
+               top="0"
+               use_ellipses="true"
+		       width="300" />
             </panel>
             <text
              follows="left|top"
@@ -204,6 +203,16 @@
              top_pad="0"
              value="Groups:"
              width="280" />
+			<group_list
+			 for_agent="false"
+			 allow_select="true"
+             height="162"
+             follows="all"
+			 left="5"
+			 name="group_list"
+             top_pad="0"
+			 width="280" />
+<!--
             <expandable_text
             follows="all"
             height="160"
@@ -220,244 +229,245 @@
             allow_scroll="false"
             expanded_bg_color="SL-Background_Light">
               Lorem ipsum dolor sit amet, consectetur adlkjpiscing elit moose moose. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet. adipiscing elit. Aenean rigviverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet sorbet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. Aenean viverra tulip moosetop. Slan de heelish marfnik tooplod. Sum sum to whop de wompam booster copm.
-            </expandable_text>               
-          </panel>
-        </scroll_container>
-    </accordion_tab>
-    <accordion_tab
-     expanded="false"
-     layout="topleft"
-     name="real_world_tab"
-     title="More Info"
-     fit_panel="false">
-        <scroll_container
-         color="SL-Background_66"
-         follows="all"
-         layout="topleft"
-         left="0"
-         name="profile_rl_scroll"
-         opaque="true"
-         height="420"
-         width="313"
-         top="0">
-           <panel
-            layout="topleft"
-            follows="left|top|right"
-            height="420"
-            name="profile_rl_scroll_panel"
-            top="0"
-            left="0"
-            width="313">
-              <texture_picker
-               allow_no_texture="true"
-               default_image_name="None"
-               enabled="false"
-               fallback_image="Generic_Person_Large"
-               follows="top|left"
-               height="225"
-               layout="topleft"
-               left="10"
-               name="real_world_pic"
-               top="00"
-               width="275" />
-              <expandable_text
-               follows="left|top|right"
-               height="240"
-               layout="topleft"
-               left="5"
-               top_pad="-3"
-               textbox.max_length="512"
-               textbox.show_context_menu="true"
-               name="fl_description_edit"
-               translate="false"
-               width="280"
-               expanded_bg_visible="true"
-               expanded_bg_color="SL-Background_Light">
-                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
-              </expandable_text>
-            <text
-             follows="left|top"
-             font.style="BOLD"
-             height="13"
-             layout="topleft"
-             left="4"
-             name="homepage_text"
-             text_color="White"
-             top_pad="3"
-             value="Web page:"
-             width="280" />
-              <text
-              follows="left|top"
-              height="15"
-              layout="topleft"
-              left="4"
-              name="homepage_edit"
-              top_pad="2"
-              translate="false"
-              value="blank"
-              width="280"
-              word_wrap="false"
-              use_ellipses="true" />
-          </panel>
-        </scroll_container>
-      </accordion_tab>
-    </accordion>
-
-    <layout_stack
-     name="layout_verb_buttons"
-     orientation="horizontal"
-     follows="bottom|left|right"
-     layout="topleft"
-     left="2"
-     top_pad="1"
-     height="30"
-     width="309"
-     border_size="0">
-      <layout_panel
-       follows="bottom|left"
-       height="30"
-       layout="topleft"
-       name="profile_buttons_panel"
-       top="0"
-       auto_resize="false"
-       width="309">
-           <layout_stack
-	     	follows="bottom|left|right"
-			height="23"
-			layout="topleft"
-			name="bottom_bar_ls"
-			left="0"
-			orientation="horizontal"
-			top_pad="5"
-			width="309">
-	
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left="0"
-				name="add_friend_btn_lp"
-			    user_resize="false" 
-			    auto_resize="true"
-				width="105">
-					<button
-			         follows="bottom|left|right"
-			         height="23"
-			         label="Add Friend"
-			         layout="topleft"
-			         left="1"
-			         mouse_opaque="false"
-			         name="add_friend"
-			         tool_tip="Offer friendship to the Resident"
-			         top="0"
-			         width="103" />	
-				</layout_panel>
-				
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left_pad="3"
-				name="im_btn_lp"
-			    user_resize="false" 
-			    auto_resize="true"
-				width="32">
-					<button
-			         follows="bottom|left|right"
-			         height="23"
-			         label="IM"
-			         layout="topleft"
-			         name="im"
-			         tool_tip="Open instant message session"
-			         top="0"
-			         left="1"
-			         width="30" />		
-				</layout_panel>
-				
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left_pad="3"
-				name="call_btn_lp"
-			    user_resize="false" 
-			    auto_resize="true"
-				width="48">
-					<button
-			         follows="bottom|left|right"
-			         height="23"
-			         label="Call"
-			         layout="topleft"
-			         name="call"
-			         tool_tip="Call this Resident"
-			         left="1"
-			         top="0"
-			         use_ellipses="true"
-			         width="46" />		
-				</layout_panel>
-				
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left_pad="3"
-				name="chat_btn_lp"
-			    user_resize="false" 
-			    auto_resize="true"
-				width="88">
-					<button
-			         follows="bottom|left|right"
-			         height="23"
-			         label="Teleport"
-			         layout="topleft"
-			         name="teleport"
-			         tool_tip="Offer teleport"
-			         left="1"
-			         top="0"
-			         use_ellipses="true"
-			         width="86" />
-				</layout_panel>
-				
-				<layout_panel
-				follows="bottom|left|right"
-				height="23"
-				layout="bottomleft"
-				left_pad="3"
-				name="overflow_btn_lp"
-			    user_resize="false" 
-			    auto_resize="false"
-				width="24">
-                           <button
-                            follows="bottom|left|right"
-                            height="23"
-                            image_overlay="OptionsMenu_Off"
-                            layout="topleft"
-                            name="overflow_btn"
-                            tool_tip="Pay money to or share inventory with the Resident"
-                            left="1"
-                            top="0"
-                            width="23" />
-                          </layout_panel>
-		</layout_stack>
-      </layout_panel>
-
-      <layout_panel
-       follows="bottom|left"
-       height="30"
-       layout="topleft"
-       name="profile_me_buttons_panel"
-       visible="false"
-       width="313">
-        <button
-         follows="bottom|right"
-         height="23"
-         left="20"
-         top="0"
-         label="Edit Profile"
-         name="edit_profile_btn"
-         tool_tip="Edit your personal information"
-         width="130"/>
-        </layout_panel>
-</layout_stack>
-</panel>
-
+            </expandable_text>
+-->
+          </panel>
+        </scroll_container>
+    </accordion_tab>
+    <accordion_tab
+     expanded="false"
+     layout="topleft"
+     name="real_world_tab"
+     title="More Info"
+     fit_panel="false">
+        <scroll_container
+         color="SL-Background_66"
+         follows="all"
+         layout="topleft"
+         left="0"
+         name="profile_rl_scroll"
+         opaque="true"
+         height="420"
+         width="313"
+         top="0">
+           <panel
+            layout="topleft"
+            follows="left|top|right"
+            height="420"
+            name="profile_rl_scroll_panel"
+            top="0"
+            left="0"
+            width="313">
+              <texture_picker
+               allow_no_texture="true"
+               default_image_name="None"
+               enabled="false"
+               fallback_image="Generic_Person_Large"
+               follows="top|left"
+               height="225"
+               layout="topleft"
+               left="10"
+               name="real_world_pic"
+               top="0"
+               width="275" />
+              <expandable_text
+               follows="left|top|right"
+               height="240"
+               layout="topleft"
+               left="5"
+               top_pad="-3"
+               textbox.max_length="512"
+               textbox.show_context_menu="true"
+               name="fl_description_edit"
+               translate="false"
+               width="280"
+               expanded_bg_visible="true"
+               expanded_bg_color="SL-Background_Light">
+                Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean viverra orci et justo sagittis aliquet.Nullamma lesuada mauris sit amet ipsum. adipiscing elit. Ae nean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum. adipiscing elit. Aenean viverra orci et justo sagittis aliquet. Nullam malesuada mauris sit amet ipsum.
+              </expandable_text>
+            <text
+             follows="left|top"
+             font.style="BOLD"
+             height="13"
+             layout="topleft"
+             left="4"
+             name="homepage_text"
+             text_color="White"
+             top_pad="3"
+             value="Web page:"
+             width="280" />
+              <text
+              follows="left|top"
+              height="15"
+              layout="topleft"
+              left="4"
+              name="homepage_edit"
+              top_pad="2"
+              translate="false"
+              value="blank"
+              width="280"
+              word_wrap="false"
+              use_ellipses="true" />
+          </panel>
+        </scroll_container>
+      </accordion_tab>
+    </accordion>
+
+    <layout_stack
+     name="layout_verb_buttons"
+     orientation="horizontal"
+     follows="bottom|left|right"
+     layout="topleft"
+     left="2"
+     top_pad="1"
+     height="30"
+     width="309"
+     border_size="0">
+      <layout_panel
+       follows="bottom|left"
+       height="30"
+       layout="topleft"
+       name="profile_buttons_panel"
+       top="0"
+       auto_resize="false"
+       width="309">
+           <layout_stack
+	     	follows="bottom|left|right"
+			height="23"
+			layout="topleft"
+			name="bottom_bar_ls"
+			left="0"
+			orientation="horizontal"
+			top_pad="5"
+			width="309">
+	
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left="0"
+				name="add_friend_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="105">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Add Friend"
+			         layout="topleft"
+			         left="1"
+			         mouse_opaque="false"
+			         name="add_friend"
+			         tool_tip="Offer friendship to the Resident"
+			         top="0"
+			         width="103" />	
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="im_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="32">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="IM"
+			         layout="topleft"
+			         name="im"
+			         tool_tip="Open instant message session"
+			         top="0"
+			         left="1"
+			         width="30" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="call_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="48">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Call"
+			         layout="topleft"
+			         name="call"
+			         tool_tip="Call this Resident"
+			         left="1"
+			         top="0"
+			         use_ellipses="true"
+			         width="46" />		
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="chat_btn_lp"
+			    user_resize="false" 
+			    auto_resize="true"
+				width="88">
+					<button
+			         follows="bottom|left|right"
+			         height="23"
+			         label="Teleport"
+			         layout="topleft"
+			         name="teleport"
+			         tool_tip="Offer teleport"
+			         left="1"
+			         top="0"
+			         use_ellipses="true"
+			         width="86" />
+				</layout_panel>
+				
+				<layout_panel
+				follows="bottom|left|right"
+				height="23"
+				layout="bottomleft"
+				left_pad="3"
+				name="overflow_btn_lp"
+			    user_resize="false" 
+			    auto_resize="false"
+				width="24">
+                           <button
+                            follows="bottom|left|right"
+                            height="23"
+                            image_overlay="OptionsMenu_Off"
+                            layout="topleft"
+                            name="overflow_btn"
+                            tool_tip="Pay money to or share inventory with the Resident"
+                            left="1"
+                            top="0"
+                            width="23" />
+                          </layout_panel>
+		</layout_stack>
+      </layout_panel>
+
+      <layout_panel
+       follows="bottom|left"
+       height="30"
+       layout="topleft"
+       name="profile_me_buttons_panel"
+       visible="false"
+       width="313">
+        <button
+         follows="bottom|right"
+         height="23"
+         left="20"
+         top="0"
+         label="Edit Profile"
+         name="edit_profile_btn"
+         tool_tip="Edit your personal information"
+         width="130"/>
+        </layout_panel>
+</layout_stack>
+</panel>
+