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

- fixed : silly GCC compiler warnings (thankies Satomi and Arrehn) 

--HG--
branch : RLVa
master
Kitty Barnett 2011-06-05 12:51:59 +02:00
parent 8589faf1aa
commit d47980b3d7
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
indra/newview/rlvlocks.cpp
View File

@ -1224,6 +1224,9 @@ void RlvFolderLocks::refreshLockedLookups() const
case LLAssetType::AT_OBJECT:
m_LockedAttachmentRem.push_back(pItem->getLinkedUUID());
break;
default:
RLV_ASSERT(true);
break;
}
}
}

4
indra/newview/rlvlocks.h
View File

@ -624,9 +624,9 @@ inline bool RlvFolderLocks::canRenameFolder(const LLUUID& idFolder) const
// Block renaming a folder if:
// - the folder (or one of its descendents) is explicitly locked by:
// -> a "shared path" => renaming the folder would change the shared path and hence invalidate the lock
// -> an attachment point \
// -> an attachment point -|
// -> an attachment |--> renaming the folder to a "dot" (=invisible) folder would invalidate the lock
// -> a wearable type /
// -> a wearable type -|
return !hasLockedFolderDescendent(idFolder, ST_SHAREDPATH | ST_ATTACHMENT | ST_ATTACHMENTPOINT | ST_WEARABLETYPE, PERM_MASK_ANY, RLV_LOCK_ANY, true);
}

2
indra/newview/rlvui.cpp
View File

@ -364,7 +364,7 @@ void RlvUIEnabler::onToggleShowMinimap()
RLV_ASSERT( (pPeoplePanel) && (pNetMapPanel) );
if (pNetMapPanel)
{
pNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("NearbyListShowMap") : NULL);
pNetMapPanel->setMakeVisibleControlVariable( (fEnable) ? gSavedSettings.getControl("NearbyListShowMap").get() : NULL);
// Reestablishing the visiblity connection will show the panel if needed so we only need to take care of hiding it when needed
if ( (!fEnable) && (pNetMapPanel->getVisible()) )
pNetMapPanel->setVisible(false);