Merge remote-tracking branch 'jacek/next' into next

Conflicts (manualy merged):
	linden/indra/newview/app_settings/default_grids.xml
	linden/indra/newview/primbackup.cpp
	linden/indra/newview/skins/default/xui/en-us/floater_about.xml
	linden/indra/newview/skins/default/xui/en-us/notifications.xml

InWorldz specific crap removed.

3 files changed, 18 insertions, 28 deletions

diff --git a/linden/indra/newview/app_settings/default_grids.xml b/linden/indra/newview/app_settings/default_grids.xml
index c45010b..ddbd921 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>33</string>
+      <key>default_grids_version</key><string>37</string>
     </map>
 
     <!-- Local Host -->
@@ -153,12 +153,13 @@
       <key>gridname</key><string>Role Play Worlds</string>
       <key>platform</key><string>OpenSim</string>
       <key>loginuri</key><string>http://grid.roleplayworlds.net:8002/</string>
-      <key>loginpage</key><string>http://grid.roleplayworlds.net/loginscreen.php</string>
+      <key>loginpage</key><string>http://roleplayworlds.net/loginscreen</string>
       <key>helperuri</key><string>http://grid.roleplayworlds.net/</string>
       <key>website</key><string>http://roleplayworlds.net/</string>
-      <key>register</key><string>http://grid.roleplayworlds.net/index.php?page=create</string>
-      <key>password</key><string>http://grid.roleplayworlds.net/index.php?page=change</string>
-      <key>version</key><string>0</string>
+      <key>support</key><string>http://roleplayworlds.net/help</string>
+      <key>register</key><string>http://roleplayworlds.net/register</string>
+      <key>password</key><string>http://roleplayworlds.net/password</string>
+      <key>version</key><string>1</string>
     </map>
 
     <!-- The New World Grid -->
@@ -166,14 +167,14 @@
       <key>gridnick</key><string>thenewworldgrid</string>
       <key>gridname</key><string>The New World Grid</string>
       <key>platform</key><string>OpenSim</string>
-      <key>loginuri</key><string>http://grid.newworldgrid.com:8002/</string>
-      <key>loginpage</key><string>http://account.newworldgrid.com/loginscreen.php</string>
-      <key>helperuri</key><string>http://account.newworldgrid.com/</string>
-      <key>website</key><string>http://www.newworldgrid.com/</string>
-      <key>support</key><string>http://www.newworldgrid.com/</string>
-      <key>register</key><string>http://www.newworldgrid.com/register</string>
-      <key>password</key><string>http://account.newworldgrid.com/</string>
-      <key>version</key><string>0</string>
+      <key>loginuri</key><string>http://giantgrid.no-ip.biz:8002/</string>
+      <key>loginpage</key><string>http://www.giantgrid.nl</string>
+      <key>helperuri</key><string>http://giantgrid.no-ip.biz/XoopCube/html/modules/xoopensim/helper/</string>
+      <key>website</key><string>http://www.giantgrid.nl</string>
+      <key>register</key><string>http://giantgrid.no-ip.biz:8002/wifi/user/account/</string>
+      <key>password</key><string>http://giantgrid.no-ip.biz:8002/wifi/forgotpassword</string>
+      <key>support</key><string>http://gianttest.no-ip.biz/ticket/</string>
+      <key>version</key><string>1</string>
     </map>
 
     <!-- 3rd Rock Grid -->
diff --git a/linden/indra/newview/app_settings/logcontrol.xml b/linden/indra/newview/app_settings/logcontrol.xml
index a94bc1b..cb40d7e 100644
--- a/linden/indra/newview/app_settings/logcontrol.xml
+++ b/linden/indra/newview/app_settings/logcontrol.xml
@@ -53,8 +53,8 @@
                                                         <!--<string>AudioEngine</string>-->
                                                         <!--<string>BodyPhysics</string>-->
               <!--<string>InitInfo</string>-->
+              <string>Inventory</string>
               <!--<string>isOwnedSelf</string>-->
-              <!--<string>Inventory</string>-->
                                                         <!--<string>HUDEffect</string>-->
               <!--<string>MarkerFile</string>-->
                                                         <!--<string>Media</string>-->
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 0ffc5e0..2ab49df 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -552,7 +552,7 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>FetchInventoryOnLogin</key>
+  <key>FetchInventoryOnLogin2</key>
         <map>
                 <key>Comment</key>
                 <string>Automatically fetch the inventory in the background after login (has issues)</string>
@@ -561,7 +561,7 @@
                 <key>Type</key>
                 <string>Boolean</string>
                 <key>Value</key>
-                <integer>0</integer>
+                <integer>1</integer>
   </map>
   <key>FloaterAnimationListRect</key>
   <map>
@@ -1031,7 +1031,7 @@
     <key>Type</key>
     <string>Boolean</string>
     <key>Value</key>
-    <integer>0</integer>
+    <integer>1</integer>
   </map>
   <key>ShowLookAtNames</key>
   <map>
@@ -8240,17 +8240,6 @@
       <key>Value</key>
       <real>48.0</real>
     </map>
-    <key>MaxSelectDistance</key>
-    <map>
-      <key>Comment</key>
-      <string>Maximum allowed selection distance (meters from avatar)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>64.0</real>
-    </map>
     <key>MeanCollisionBump</key>
     <map>
       <key>Comment</key>