7 files changed, 22 insertions, 5 deletions

diff --git a/linden/indra/newview/hippoLimits.cpp b/linden/indra/newview/hippoLimits.cpp
index 78a5856..a5d6ee6 100644
--- a/linden/indra/newview/hippoLimits.cpp
+++ b/linden/indra/newview/hippoLimits.cpp
@@ -215,9 +215,9 @@ F32 HippoLimits::getMaxDragDistance() const
         {
                 F32 max_drag_distance = gSavedSettings.getBOOL("LimitDragDistance") ? gSavedSettings.getF32("MaxDragDistance") : FLT_MAX;
 
-                if(max_drag_distance > gHippoLimits->getMaxDragDistance()) //Chose the more restrictive

+                if(max_drag_distance > mMaxDragDistance) //Chose the more restrictive

                 {

-                        max_drag_distance = gHippoLimits->getMaxDragDistance();

+                        max_drag_distance = mMaxDragDistance;

                 }
                 return max_drag_distance;
         }
diff --git a/linden/indra/newview/llcloud.cpp b/linden/indra/newview/llcloud.cpp
index f4f5761..3e9b86a 100644
--- a/linden/indra/newview/llcloud.cpp
+++ b/linden/indra/newview/llcloud.cpp
@@ -336,10 +336,10 @@ void LLCloudLayer::destroy()
         mWindp = NULL;
 }
 
-
 void LLCloudLayer::reset()
 {
 }
+
 void LLCloudLayer::setWindPointer(LLWind *windp)
 {
         if (mWindp)
diff --git a/linden/indra/newview/llhudeffectlookat.cpp b/linden/indra/newview/llhudeffectlookat.cpp
index 75e2f30..ccd723f 100644
--- a/linden/indra/newview/llhudeffectlookat.cpp
+++ b/linden/indra/newview/llhudeffectlookat.cpp
@@ -53,6 +53,7 @@
 // [/RLVa:KB]
 
 #include "llxmltree.h"
+#include "hippolimits.h"
 
 
 BOOL LLHUDEffectLookAt::sDebugLookAt = FALSE;
@@ -553,7 +554,7 @@ void LLHUDEffectLookAt::setSourceObject(LLViewerObject* objectp)
 //-----------------------------------------------------------------------------
 void LLHUDEffectLookAt::render()
 {
-        if (sDebugLookAt && mSourceObject.notNull())
+        if (sDebugLookAt && mSourceObject.notNull() && gHippoLimits->mAllowMinimap) //Has to have allow minimap as well, otherwise it defeats the purpose of no minimap
         {
                 gGL.getTexUnit(0)->unbind(LLTexUnit::TT_TEXTURE);
 
diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 5a10e98..5a55351 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -1861,7 +1861,7 @@ BOOL LLSelectMgr::selectionAllPCode(LLPCode code)
                 f(const LLPCode& t) : mCode(t) {}
                 virtual bool apply(LLViewerObject* object)
                 {
-                        if (object->getPCode() != mCode)
+                        if (object->getPCode() != mCode && !gSavedSettings.getBOOL("AllowEditingOfTrees"))
                         {
                                 return FALSE;
                         }
diff --git a/linden/indra/newview/llviewermenu.h b/linden/indra/newview/llviewermenu.h
index 632f783..f33c201 100644
--- a/linden/indra/newview/llviewermenu.h
+++ b/linden/indra/newview/llviewermenu.h
@@ -110,6 +110,8 @@ bool handle_give_money_dialog();
 bool handle_object_open();
 bool handle_go_to_confirm();
 bool handle_go_to();
+void handle_open_message_log(void*);
+void handle_open_message_builder(void*);
 
 // Export to XML or Collada
 void handle_export_selected( void * );
diff --git a/linden/indra/newview/skins/default/xui/en-us/notifications.xml b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
index b98ff7c..3680ca9 100644
--- a/linden/indra/newview/skins/default/xui/en-us/notifications.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/notifications.xml
@@ -3653,6 +3653,16 @@ Default: off
 
 <notification
  icon="alertmodal.tga"
+ label="Minimum Age"
+ name="HelpRegionMinimumAge"
+ type="alertmodal">
+This sets the minimum age (in days) that users entering this sim have to be to enter.
+
+Default: 0 (disabled)
+</notification>
+
+<notification
+ icon="alertmodal.tga"
  label="Block Fly"
  name="HelpRegionBlockFly"
  type="alertmodal">
diff --git a/linden/indra/newview/wlsettingsmanager.cpp b/linden/indra/newview/wlsettingsmanager.cpp
index ea37f61..853d14f 100644
--- a/linden/indra/newview/wlsettingsmanager.cpp
+++ b/linden/indra/newview/wlsettingsmanager.cpp
@@ -74,6 +74,7 @@
 #include "llviewercontrol.h"
 #include "message.h"
 #include "meta7windlight.h"
+#include "llworld.h"
 
 #undef max
 
@@ -223,6 +224,8 @@ void WLSettingsManager::Apply()
                 sky_mgr->loadPreset( wlSkyPresetName, true );
         }
 
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
+
         mSky = NULL;
         mWater = NULL;
         mWaterNormal = NULL;
@@ -232,6 +235,7 @@ void WLSettingsManager::Apply()
 void WLSettingsManager::wlresetRegion()
 {
         wlIgnoreRegion = false;
+        LLWorld::getInstance()->rebuildClouds(gAgent.getRegion());
 }
 
 // static