summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--indra/newview/llfloaterdebugmaterials.cpp5
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)
{