diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-05-08 18:44:04 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-05-08 18:44:04 -0700 |
| commit | 2d94e8e764045e499a0f6216c2f05d14ada4136b (patch) | |
| tree | 08ba1afe8943ffc3d744f2441c72697e461a7212 /indra/newview | |
| parent | 7a9f62ab302d365238871f3bdcc251c04ad14270 (diff) | |
PATH-629: Allowing viewer edits to permanent objects when in god-mode regardless of frozen mode.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloatertools.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 2a722d8ed4..c8599df161 100644 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -133,6 +133,7 @@ public: if(tools_floater) { tools_floater->updateLandImpacts(); + tools_floater->dirty(); } } }; diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 2a0e06a57d..ce9c47adc4 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -5294,7 +5294,7 @@ void LLViewerObject::markForUpdate(BOOL priority) bool LLViewerObject::isPermanentEnforced() const { - return flagObjectPermanent() && !LLPathfindingManager::getInstance()->isAllowAlterPermanent(); + return flagObjectPermanent() && !LLPathfindingManager::getInstance()->isAllowAlterPermanent() && !gAgent.isGodlike(); } bool LLViewerObject::getIncludeInSearch() const |