From 2d94e8e764045e499a0f6216c2f05d14ada4136b Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Tue, 8 May 2012 18:44:04 -0700
Subject: PATH-629: Allowing viewer edits to permanent objects when in god-mode
 regardless of frozen mode.

---
 indra/newview/llviewerobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobject.cpp')

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
-- 
cgit v1.2.3