Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lirusaito
2016-03-31 07:38:43 -04:00
parent 0c75255da7
commit 62b6531468
4 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/llfloatercamera.cpp
View File

@@ -50,7 +50,7 @@ const F32 CAMERA_BUTTON_DELAY = 0.0f;
// //
LLFloaterCamera::LLFloaterCamera(const LLSD& val) LLFloaterCamera::LLFloaterCamera(const LLSD& val)
: LLFloater("camera floater") // uses "FloaterCameraRect3" : LLFloater("camera floater"), // uses "FloaterCameraRect3"
mRotate(nullptr), mRotate(nullptr),
mZoom(nullptr), mZoom(nullptr),
mTrack(nullptr) mTrack(nullptr)

1
indra/newview/llfloaterland.cpp
View File

@@ -243,7 +243,6 @@ LLFloaterLand::LLFloaterLand(const LLSD& seed)
, mPanelMedia(nullptr) , mPanelMedia(nullptr)
, mPanelAccess(nullptr) , mPanelAccess(nullptr)
, mPanelCovenant(nullptr) , mPanelCovenant(nullptr)
, mPanelExperiences(nullptr)
{ {
mFactoryMap["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this); mFactoryMap["land_general_panel"] = LLCallbackMap(createPanelLandGeneral, this);
mFactoryMap["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this); mFactoryMap["land_covenant_panel"] = LLCallbackMap(createPanelLandCovenant, this);

2
indra/newview/llimpanel.cpp
View File

@@ -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> ding("LiruNewMessageSound");
static const LLCachedControl<std::string> dong("LiruNewMessageSoundForSystemMessages"); static const LLCachedControl<std::string> dong("LiruNewMessageSoundForSystemMessages");
LLUI::sAudioCallback(LLUUID(from_user ? ding : dong)); 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 // start tab flashing when receiving im for background session from user

2
indra/newview/llmaniptranslate.cpp
View File

@@ -2317,7 +2317,7 @@ BOOL LLManipTranslate::canAffectSelection()
virtual bool apply(LLViewerObject* objectp) virtual bool apply(LLViewerObject* objectp)
{ {
LLViewerObject *root_object = (objectp == NULL) ? NULL : objectp->getRootEdit(); 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()) && ((root_object == NULL) || !root_object->isPermanentEnforced()) &&
(objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts")); (objectp->permModify() || !gSavedSettings.getBOOL("EditLinkedParts"));
} }