Merge remote-tracking branch 'secondlife/release/maint-c' into maint-c

1 files changed, 18 insertions, 0 deletions

diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 8a3c8b9b17..6d0dac41db 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -243,6 +243,23 @@ LLSelectMgr::LLSelectMgr()
 
     mForceSelection = false;
     mShowSelection = false;
+
+    LLControlVariable* ctrl = gSavedSettings.getControl("DebugSelectionLODs").get();
+    if (ctrl)
+    {
+        mSlectionLodModChangedConnection = ctrl->getSignal()->connect([this](LLControlVariable*, const LLSD&, const LLSD&)
+        {
+            for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
+                iter != mSelectedObjects->end(); ++iter)
+            {
+                LLViewerObject* object = (*iter)->getObject();
+                if (object)
+                {
+                    object->updateLOD();
+                }
+            }
+        });
+    }
 }
 
 
@@ -252,6 +269,7 @@ LLSelectMgr::LLSelectMgr()
 LLSelectMgr::~LLSelectMgr()
 {
     clearSelections();
+    mSlectionLodModChangedConnection.disconnect();
 }
 
 void LLSelectMgr::clearSelections()