diff options
| author | William Todd Stinson <stinson@lindenlab.com> | 2012-10-10 17:10:35 -0700 |
|---|---|---|
| committer | William Todd Stinson <stinson@lindenlab.com> | 2012-10-10 17:10:35 -0700 |
| commit | 7b3552e932126ad6eeef0db886511e2d4758fac5 (patch) | |
| tree | 6558135d8fdb833d685bbf2e48ac882f92632699 /indra/newview | |
| parent | 0ea99ea01fc12fa0210a61a3664ff828d3984575 (diff) | |
Restricting editing of objects through the debug materials floater to the current region only.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterdebugmaterials.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llfloaterdebugmaterials.cpp b/indra/newview/llfloaterdebugmaterials.cpp index 10a4e9e022..9546220d4c 100644 --- a/indra/newview/llfloaterdebugmaterials.cpp +++ b/indra/newview/llfloaterdebugmaterials.cpp @@ -686,6 +686,11 @@ void LLFloaterDebugMaterials::requestPutMaterials(bool pIsDoSet) if (viewerObject != NULL) { + const LLViewerRegion* viewerRegion = viewerObject->getRegion(); + if (region != viewerRegion) + { + llerrs << "cannot currently edit an object on a different region through the debug materials floater" << llendl; + } S32 numTEs = llmin(static_cast<S32>(viewerObject->getNumTEs()), viewerObject->getNumFaces()); for (S32 curTEIndex = 0; curTEIndex < numTEs; ++curTEIndex) { |