Merge remote-tracking branch 'imprudence/exp' into exp

Conflicts (for future reference):
	linden/indra/llcommon/llstring.cpp
	linden/indra/newview/llpanelnetwork.cpp
	linden/indra/newview/llselectmgr.cpp
	linden/indra/newview/llstartup.cpp
	linden/indra/newview/lltoolmgr.cpp
	linden/indra/newview/llvoavatar.cpp

4 files changed, 287 insertions, 46 deletions

diff --git a/linden/indra/newview/app_settings/cloud.xml b/linden/indra/newview/app_settings/cloud.xml
index e62bcf1..fdc420a 100644
--- a/linden/indra/newview/app_settings/cloud.xml
+++ b/linden/indra/newview/app_settings/cloud.xml
@@ -49,8 +49,9 @@
     <key>ParticleMaxAge</key><!-- how long a single particle can live with 0 forever -->
         <real>4</real>
 
-    <key>PartImageID</key> <!--This setting is ignored for the cloud, used instead for now is the hardcoded -->
-        <string>0000000000000-0000-0000-000000000000</string><!-- skins/default/textures/cloud-particle.j2c -->
+    <key>PartImageID</key> 
+        <!--if this is a NULL UUID the hardcoded skins/default/textures/cloud-particle.j2c is used-->
+        <string>0000000000000-0000-0000-000000000000</string>
 
     <key>StartColor</key><!-- RGBA -->
         <array>
diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index c6360d4..bea272d 100644
--- a/linden/indra/newview/app_settings/default_grids.xml
+++ b/linden/indra/newview/app_settings/default_grids.xml
@@ -1,7 +1,7 @@
 <llsd>
   <array>
     <map>
-      <key>default_grids_version</key><string>32</string>
+      <key>default_grids_version</key><string>33</string>
     </map>
 
     <!-- Second Life -->
@@ -191,17 +191,17 @@
 
     <!-- InWorldz -->
     <map>
-      <key>gridname</key>  <string>Inworldz</string>
+      <key>gridname</key>  <string>InWorldz</string>
       <key>gridnick</key>  <string>inworldz</string>
       <key>platform</key>  <string>OpenSim</string>
       <key>loginuri</key>  <string>http://inworldz.com:8002/</string>
       <key>loginpage</key> <string>http://inworldz.com/loginscreen.php</string>
       <key>helperuri</key> <string>http://inworldz.com/</string>
-      <key>password</key>  <string>http://inworldz.com/wpassword</string>
-      <key>register</key>  <string>http://inworldz.com/register</string>
-      <key>support</key>   <string>http://inworldz.com/help</string>
-      <key>website</key>   <string>http://inworldz.com/about/</string>
-      <key>version</key>   <string>1</string>
+      <key>password</key>  <string>http://inworldz.com/loginerror.php?error=2</string>
+      <key>register</key>  <string>http://inworldz.com/register.php</string>
+      <key>support</key>   <string>http://inworldz.com/support.php</string>
+      <key>website</key>   <string>http://inworldz.com/</string>
+      <key>version</key>   <string>2</string>
     </map> 
 
     <!-- meta 7 -->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index d0b8108..833f191 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -2,7 +2,9 @@
 <llsd>
 <map>
 
-<!-- for Aurora Sim -->
+  <!-- BEGIN IMPRUDENCE-SPECIFIC SETTINGS -->
+  
+  <!-- begin Aurora-specific settings -->
 
   <key>TimeOffset</key>
   <map>
@@ -48,7 +50,8 @@
     <key>Value</key>
     <string>SLVoice</string>
   </map>
-  <!-- Imprudence-specific settings -->
+  
+  <!-- end Aurora-specific settings -->
 
   <key>AllowEditingOfTrees</key>
   <map>
@@ -135,6 +138,17 @@
       <real>1</real>
     </array>
   </map>
+  <key>HeadFollowsMouse</key>
+  <map>
+    <key>Comment</key>
+    <string>IF your avatars head follows your mouse movements (then the extend is defined in YawFromMousePosition  and PitchFromMousePosition</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>HighlightOwnNameInChat</key>
   <map>
     <key>Comment</key>
@@ -913,6 +927,17 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+  <key>PreviewAvatarAsCloud</key>
+  <map>
+    <key>Comment</key>
+    <string>Turns your avatar into the paricle clud if true</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>PrivateLookAtTarget</key>
   <map>
     <key>Comment</key>
@@ -946,6 +971,17 @@
     <key>Value</key>
     <real>0.0</real>
   </map>
+  <key>SaveSearchResults</key>
+  <map>
+    <key>Comment</key>
+    <string>Saves search results when closing search window rather than clearing resources</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
   <key>ShowLookAtNames</key>
   <map>
     <key>Comment</key>
@@ -1667,6 +1703,23 @@
   </map>
 
   <!-- Begin: Client Name Tag -->
+
+  <key>ImprudenceTagColor</key>
+  <map>
+    <key>Comment</key>
+    <string>Color of Imprudence tags (displayed only locally)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Color4</string>
+    <key>Value</key>
+    <array>
+      <real>0.79</real>
+      <real>0.44</real>
+      <real>0.88</real>
+      <real>1</real>
+    </array>
+  </map>
   <key>ShowClientColor</key>
   <map>
     <key>Comment</key>
@@ -2069,6 +2122,8 @@
   </map>
   
   <!-- End: Spellcheck & Translation -->
+  
+  <!-- Begin: RLVa -->
 
   <key>RestrainedLove</key>
   <map>
@@ -2246,6 +2301,224 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
+
+  <!-- End: RLVa -->
+  
+  <!-- Begin: socks5 -->
+
+  <key>Socks5ProxyEnabled</key>
+  <map>
+    <key>Comment</key>
+    <string>Use Socks5 Proxy</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>Socks5HttpProxyType</key>
+  <map>
+    <key>Comment</key>
+    <string>Proxy type to use for HTTP operations</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <integer>None</integer>
+  </map>
+  <key>Socks5ProxyHost</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Host</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string />
+  </map>
+  <key>Socks5ProxyPort</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Proxy Port</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>1080</integer>
+  </map>
+  <key>Socks5Username</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Username</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5Password</key>
+  <map>
+    <key>Comment</key>
+    <string>Socks 5 Password</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string></string>
+  </map>
+  <key>Socks5AuthType</key>
+  <map>
+    <key>Comment</key>
+    <string>Selected Auth mechanism for Socks5</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>String</string>
+    <key>Value</key>
+    <string>None</string>
+  </map>
+
+  <!-- End: socks5 -->
+
+  <!-- Begin: full radar (Advanced menu) -->
+
+  <key>ShowRadar</key>
+  <map>
+    <key>Comment</key>
+    <string>Show the radar floater</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>FloaterRadarRect</key>
+  <map>
+    <key>Comment</key>
+    <string>Rectangle for Radar</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Rect</string>
+    <key>Value</key>
+    <array>
+      <integer>0</integer>
+      <integer>400</integer>
+      <integer>200</integer>
+      <integer>0</integer>
+    </array>
+  </map>
+  <key>RadarKeepOpen</key>
+  <map>
+    <key>Comment</key>
+    <string>Keeps radar updates running in background</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarUpdateRate</key>
+  <map>
+    <key>Comment</key>
+    <string>Radar update rate (0 = high, 1 = medium, 2 = low)</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>U32</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RadarAlertSim</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting sim</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertDraw</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting draw distance</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertShoutRange</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting shout range</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarAlertChatRange</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts for avatars entering/exiting chat range</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  <key>RadarChatAlerts</key>
+  <map>
+    <key>Comment</key>
+    <string>Whether the radar emits chat alerts regarding the status of avatars it displays</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarChatKeys</key>
+  <map>
+    <key>Comment</key>
+    <string>Enable private chat alerts for avatars entering the region</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>0</integer>
+  </map>
+  <key>RadarChatKeysChannel</key>
+  <map>
+    <key>Comment</key>
+    <string>Private channel used to broadcast the key of incoming avatars</string>
+    <key>Persist</key>
+    <integer>1</integer>
+    <key>Type</key>
+    <string>S32</string>
+    <key>Value</key>
+    <integer>-8888888</integer>
+  </map>
+  
+  <!-- End: full radar (Advanced menu) -->
+
+  <!-- END IMPRUDENCE-SPECIFIC SETTINGS -->
+  
   <key>AFKTimeout</key>
   <map>
     <key>Comment</key>
@@ -3002,7 +3275,7 @@
   <key>BrowserProxyAddress</key>
   <map>
     <key>Comment</key>
-    <string>Address for the Web Proxy]</string>
+    <string>Address for the Web Proxy</string>
     <key>Persist</key>
     <integer>1</integer>
     <key>Type</key>
@@ -5619,17 +5892,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>FirstName</key>
-  <map>
-    <key>Comment</key>
-    <string>Login first name</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>String</string>
-    <key>Value</key>
-    <string />
-  </map>
   <key>FirstPersonAvatarVisible</key>
   <map>
     <key>Comment</key>
@@ -7530,17 +7792,6 @@
       <key>Value</key>
       <string>find_all_panel</string>
     </map>
-    <key>LastName</key>
-    <map>
-      <key>Comment</key>
-      <string>Login last name</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
     <key>LastPrefTab</key>
     <map>
       <key>Comment</key>
@@ -7915,17 +8166,6 @@
       <key>Value</key>
       <integer>1</integer>
     </map>
-    <key>Marker</key>
-    <map>
-      <key>Comment</key>
-      <string>[NOT USED]</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>String</string>
-      <key>Value</key>
-      <string />
-    </map>
     <key>MaxDragDistance</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/app_settings/viewerversion.xml b/linden/indra/newview/app_settings/viewerversion.xml
index a220cf2..051f2a3 100644
--- a/linden/indra/newview/app_settings/viewerversion.xml
+++ b/linden/indra/newview/app_settings/viewerversion.xml
@@ -20,6 +20,6 @@ need to be changed manually - MC
   <viewer version_patch="0" />
 
   <!--string-->
-  <viewer version_test="Experimental 2011.04.02" />
+  <viewer version_test="Experimental 2011.04.19" />
   
 </viewer_version>