From d47980b3d7ae638ac2d760e9f09f74902ca17101 Mon Sep 17 00:00:00 2001 From: Kitty Barnett Date: Sun, 5 Jun 2011 12:51:59 +0200 Subject: [PATCH] - fixed : silly GCC compiler warnings (thankies Satomi and Arrehn) --HG-- branch : RLVa --- indra/newview/rlvlocks.cpp | 3 +++ indra/newview/rlvlocks.h | 4 ++-- indra/newview/rlvui.cpp | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp index 5f5ddc846b..e7b4645239 100644 --- a/indra/newview/rlvlocks.cpp +++ b/indra/newview/rlvlocks.cpp @@ -1224,6 +1224,9 @@ void RlvFolderLocks::refreshLockedLookups() const case LLAssetType::AT_OBJECT: m_LockedAttachmentRem.push_back(pItem->getLinkedUUID()); break; + default: + RLV_ASSERT(true); + break; } } } diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h index 87feeb1a86..97e4f6e2bf 100644 --- a/indra/newview/rlvlocks.h +++ b/indra/newview/rlvlocks.h @@ -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); } diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp index ba84e54e7a..1147b48645 100644 --- a/indra/newview/rlvui.cpp +++ b/indra/newview/rlvui.cpp @@ -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);