From 7b3552e932126ad6eeef0db886511e2d4758fac5 Mon Sep 17 00:00:00 2001 From: William Todd Stinson Date: Wed, 10 Oct 2012 17:10:35 -0700 Subject: Restricting editing of objects through the debug materials floater to the current region only. --- indra/newview/llfloaterdebugmaterials.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/newview') 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(viewerObject->getNumTEs()), viewerObject->getNumFaces()); for (S32 curTEIndex = 0; curTEIndex < numTEs; ++curTEIndex) { -- cgit v1.2.3