livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PATH-760: Renaming some methods of LLSelectMgr.

master
Todd Stinson 2012-06-21 17:29:12 -07:00
parent f86e2891be
commit aea6b0c70c
5 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llfloatertools.cpp
View File

@ -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

4
indra/newview/llpanelpermissions.cpp
View File

@ -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;

14
indra/newview/llselectmgr.cpp
View File

@ -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++ )

6
indra/newview/llselectmgr.h
View File

@ -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();

4
indra/newview/llsidepaneltaskinfo.cpp
View File

@ -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[] =