From 62b6531468c1fb15ed2594c61c5f3ed5b2afc233 Mon Sep 17 00:00:00 2001 From: Lirusaito Date: Thu, 31 Mar 2016 07:38:43 -0400 Subject: [PATCH] I thought I'd done all these right already... meh~ --- indra/newview/llfloatercamera.cpp | 2 +- indra/newview/llfloaterland.cpp | 1 - indra/newview/llimpanel.cpp | 2 -- indra/newview/llmaniptranslate.cpp | 2 +- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/indra/newview/llfloatercamera.cpp b/indra/newview/llfloatercamera.cpp index b23883816..c2bf20283 100644 --- a/indra/newview/llfloatercamera.cpp +++ b/indra/newview/llfloatercamera.cpp @@ -50,7 +50,7 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f; // LLFloaterCamera::LLFloaterCamera(const LLSD& val) -: LLFloater("camera floater") // uses "FloaterCameraRect3" +: LLFloater("camera floater"), // uses "FloaterCameraRect3" mRotate(nullptr), mZoom(nullptr), mTrack(nullptr) diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 4b1ccacb6..2318dd601 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -243,7 +243,6 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed) , mPanelMedia(nullptr) , mPanelAccess(nullptr) , mPanelCovenant(nullptr) - , mPanelExperiences(nullptr) { mFactoryMap["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this); mFactoryMap["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); diff --git a/indra/newview/llimpanel.cpp b/indra/newview/llimpanel.cpp index df956b2e0..319e9a7e8 100644 --- a/indra/newview/llimpanel.cpp +++ b/indra/newview/llimpanel.cpp @@ -747,8 +747,6 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol static const LLCachedControl ding("LiruNewMessageSound"); static const LLCachedControl dong("LiruNewMessageSoundForSystemMessages"); LLUI::sAudioCallback(LLUUID(from_user ? ding : dong)); - void flash_viewer_window(S32); - flash_viewer_window(2); } // start tab flashing when receiving im for background session from user diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index b3d46fb56..9dcb6fdc1 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -2317,7 +2317,7 @@ BOOL LLManipTranslate::canAffectSelection() virtual bool apply(LLViewerObject* objectp) { LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit(); - return object && objectp->permMove() && !objectp->isPermanentEnforced() && + return objectp && objectp->permMove() && !objectp->isPermanentEnforced() && ((root_object == NULL) || !root_object->isPermanentEnforced()) && (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); }