Permalink
Browse files

I thought I'd done all these right already... meh~

  • Loading branch information...
Lirusaito committed Mar 31, 2016
1 parent 0c75255 commit 62b6531468c1fb15ed2594c61c5f3ed5b2afc233
@@ -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)
@@ -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);
@@ -747,8 +747,6 @@ void LLFloaterIMPanel::addHistoryLine(const std::string &utf8msg, LLColor4 incol
static const LLCachedControl<std::string> ding("LiruNewMessageSound");
static const LLCachedControl<std::string> 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
@@ -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"));
}

0 comments on commit 62b6531

Please sign in to comment.