From df4d167cd13fd89a85e4d30dca94e40c934707d7 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Fri, 21 Dec 2007 06:44:41 +0000 Subject: svn merge -r74200:76302 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release Wheee, this was fun. Um, let's back-port fixes a little more rapidly next time. Reviewed by CG until alexandria died, did the rest by my lonesome. --- indra/newview/llviewerobject.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'indra/newview/llviewerobject.cpp') diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 9243263794..f242b06d9b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -4511,7 +4511,8 @@ BOOL LLViewerObject::permYouOwner() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } @@ -4547,7 +4548,8 @@ BOOL LLViewerObject::permOwnerModify() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } @@ -4570,7 +4572,8 @@ BOOL LLViewerObject::permModify() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } @@ -4593,7 +4596,8 @@ BOOL LLViewerObject::permCopy() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } @@ -4616,7 +4620,8 @@ BOOL LLViewerObject::permMove() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } @@ -4639,7 +4644,8 @@ BOOL LLViewerObject::permTransfer() const return TRUE; #else # ifdef TOGGLE_HACKED_GODLIKE_VIEWER - if (!gInProductionGrid && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) + if (!LLAppViewer::instance()->isInProductionGrid() + && (gAgent.getGodLevel() >= GOD_MAINTENANCE)) { return TRUE; } -- cgit v1.2.3