summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorTodd Stinson <stinson@lindenlab.com>2012-06-21 17:29:12 -0700
committerTodd Stinson <stinson@lindenlab.com>2012-06-21 17:29:12 -0700
commitaea6b0c70ccb1a330c1ee2a0f66c3fa72d2700ca (patch)
tree0c0f3fedcc5caf8972dc00d2163d676edf40992c /indra/newview/llselectmgr.cpp
parentf86e2891be5a4e55f0ffae685915a92d8514e59a (diff)
PATH-760: Renaming some methods of LLSelectMgr.
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-rw-r--r--indra/newview/llselectmgr.cpp14
1 files changed, 7 insertions, 7 deletions
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++ )