PATH-760: Renaming some methods of LLSelectMgr.

5 files changed, 16 insertions, 16 deletions

diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 105636364c..3eb0b484dd 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1199,8 +1199,8 @@ void LLFloaterTools::getMediaState()
 	}
 	
 	BOOL is_nonpermanent = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
-		&& LLSelectMgr::getInstance()->selectGetRootsNonPermanent())
-		|| LLSelectMgr::getInstance()->selectGetNonPermanent();
+		&& LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced())
+		|| LLSelectMgr::getInstance()->selectGetNonPermanentEnforced();
 	bool editable = is_nonpermanent && (first_object->permModify() || selectedMediaEditable());
 
 	// Check modify permissions and whether any selected objects are in
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 262dadf907..3890bddfa5 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -304,8 +304,8 @@ void LLPanelPermissions::refresh()
 						   && LLSelectMgr::getInstance()->selectGetRootsModify())
 		|| LLSelectMgr::getInstance()->selectGetModify();
 	BOOL is_nonpermanent = (LLSelectMgr::getInstance()->getSelection()->getFirstRootNode() 
-						   && LLSelectMgr::getInstance()->selectGetRootsNonPermanent())
-		|| LLSelectMgr::getInstance()->selectGetNonPermanent();
+						   && LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced())
+		|| LLSelectMgr::getInstance()->selectGetNonPermanentEnforced();
 	const LLFocusableElement* keyboard_focus_view = gFocusMgr.getKeyboardFocus();
 
 	S32 string_index = 0;
diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp
index 49c568039c..d8e6ed296f 100644
--- a/indra/newview/llselectmgr.cpp
+++ b/indra/newview/llselectmgr.cpp
@@ -593,7 +593,7 @@ bool LLSelectMgr::linkObjects()
 		return true;
 	}
 
-	if (!LLSelectMgr::getInstance()->selectGetRootsNonPermanent())
+	if (!LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced())
 	{
 		LLNotificationsUtil::add("CannotLinkPermanent");
 		return true;
@@ -2509,10 +2509,10 @@ BOOL LLSelectMgr::selectGetRootsModify()
 
 
 //-----------------------------------------------------------------------------
-// selectGetPermanent() - return TRUE if current agent can modify all
-// selected objects.
+// selectGetNonPermanentEnforced() - return TRUE if all objects are not
+// permanent enforced
 //-----------------------------------------------------------------------------
-BOOL LLSelectMgr::selectGetNonPermanent()
+BOOL LLSelectMgr::selectGetNonPermanentEnforced()
 {
 	for (LLObjectSelection::iterator iter = getSelection()->begin();
 		 iter != getSelection()->end(); iter++ )
@@ -2532,10 +2532,10 @@ BOOL LLSelectMgr::selectGetNonPermanent()
 }
 
 //-----------------------------------------------------------------------------
-// selectGetRootsModify() - return TRUE if current agent can modify all
-// selected root objects.
+// selectGetRootsNonPermanentEnforced() - return TRUE if all root objects are
+// not permanent enforced
 //-----------------------------------------------------------------------------
-BOOL LLSelectMgr::selectGetRootsNonPermanent()
+BOOL LLSelectMgr::selectGetRootsNonPermanentEnforced()
 {
 	for (LLObjectSelection::root_iterator iter = getSelection()->root_begin();
 		 iter != getSelection()->root_end(); iter++ )
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h
index 07eb62a8fa..9787493e43 100644
--- a/indra/newview/llselectmgr.h
+++ b/indra/newview/llselectmgr.h
@@ -560,9 +560,9 @@ public:
 	BOOL selectGetRootsModify();
 	BOOL selectGetModify();
 
-	// returns TRUE if is all objects are non-permanent
-	BOOL selectGetRootsNonPermanent();
-	BOOL selectGetNonPermanent();
+	// returns TRUE if is all objects are non-permanent-enforced
+	BOOL selectGetRootsNonPermanentEnforced();
+	BOOL selectGetNonPermanentEnforced();
 
 	// returns TRUE if selected objects can be transferred.
 	BOOL selectGetRootsTransfer();
diff --git a/indra/newview/llsidepaneltaskinfo.cpp b/indra/newview/llsidepaneltaskinfo.cpp
index 4b84bbb265..8a1fa20a4e 100644
--- a/indra/newview/llsidepaneltaskinfo.cpp
+++ b/indra/newview/llsidepaneltaskinfo.cpp
@@ -301,8 +301,8 @@ void LLSidepanelTaskInfo::refresh()
 	// BUG: fails if a root and non-root are both single-selected.
 	const BOOL is_perm_modify = (mObjectSelection->getFirstRootNode() && LLSelectMgr::getInstance()->selectGetRootsModify()) ||
 		LLSelectMgr::getInstance()->selectGetModify();
-	const BOOL is_nonpermanent = (mObjectSelection->getFirstRootNode() && LLSelectMgr::getInstance()->selectGetRootsNonPermanent()) ||
-		LLSelectMgr::getInstance()->selectGetNonPermanent();
+	const BOOL is_nonpermanent = (mObjectSelection->getFirstRootNode() && LLSelectMgr::getInstance()->selectGetRootsNonPermanentEnforced()) ||
+		LLSelectMgr::getInstance()->selectGetNonPermanentEnforced();
 
 	S32 string_index = 0;
 	std::string MODIFY_INFO_STRINGS[] =