Added handler for new OpenSim function "OpenRegionInfo", more info at http://imprudenceviewer.org/wiki/Opensim_information_needed

Currently only supports a fraction of the provided parameters.

5 files changed, 27 insertions, 7 deletions

diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index 1691095..b071795 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -90,6 +90,7 @@ set(viewer_SOURCE_FILES
     impprefsfonts.cpp
     jcfloater_animation_list.cpp
     jcfloaterareasearch.cpp
+    kowopenregionsettings.cpp
     lightshare.cpp
     llagent.cpp
     llagentaccess.cpp
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index ee8f76e..70659f8 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -1168,6 +1168,20 @@
     <integer>1</integer>
   </map>
 
+  <!-- Begin: OpenRegionInfo -->
+  
+  <key>ToggleTeenMode</key>
+  <map>
+    <key>Comment</key>
+    <string>Allow the toggle of Teen Mode via debug options</string>
+    <key>Persist</key>
+    <integer>0</integer>
+    <key>Type</key>
+    <string>Boolean</string>
+    <key>Value</key>
+    <integer>1</integer>
+  </map>
+  
   <!-- Begin: AO-->
 
   <key>AOEnabled</key>
diff --git a/linden/indra/newview/hippoLimits.h b/linden/indra/newview/hippoLimits.h
index f76e7e9..a5fe351 100644
--- a/linden/indra/newview/hippoLimits.h
+++ b/linden/indra/newview/hippoLimits.h
@@ -19,7 +19,6 @@ public:
 
         void    setLimits();
 
-private:
         S32             mMaxAgentGroups;
 
         F32             mMaxHeight;
@@ -29,6 +28,7 @@ private:
         F32             mMinPrimScale;
         S32             mMaxLinkedPrims;
 
+private:
         void    setOpenSimLimits();
         void    setSecondLifeLimits();
 };
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index fd6e842..681216a 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -7137,11 +7137,16 @@ void handle_test_female(void*)
 
 void handle_toggle_pg(void*)
 {
-        gAgent.setTeen( !gAgent.isTeen() );
-
-        LLFloaterWorldMap::reloadIcons(NULL);
-
-        llinfos << "PG status set to " << (S32)gAgent.isTeen() << llendl;
+        if(gSavedSettings.getBOOL("ToggleTeenMode"))
+        {
+                gAgent.setTeen( !gAgent.isTeen() );
+                LLFloaterWorldMap::reloadIcons(NULL);
+                llinfos << "PG status set to " << (S32)gAgent.isTeen() << llendl;
+        }
+        else
+        {
+                llinfos << "Teen mode cannot be toggled on this region" << llendl;
+        }
 }
 
 void handle_dump_attachments(void*)
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
index fffab6c..0a27f85 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
@@ -1803,7 +1803,7 @@
         <menu_item_call name="Test Female" label="Test Female">
           <on_click function="Advanced.TestFemale" userdata="" />
         </menu_item_call>
-        <menu_item_call name="Toggle PG" label="Toggle PG">
+        <menu_item_call name="Toggle PG" label="Toggle Teen Mode">
           <on_click function="Advanced.TogglePG" userdata="" />
         </menu_item_call>
         <menu_item_check name="Allow Select Avatar"