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

Merge shyotl, setting include broken (disabled)

Browse Source
This commit is contained in:
Siana Gearz
2010-11-09 15:14:34 +01:00
parent 8d6ce154fd f357842265
commit 17a0d13b0c
61 changed files with 3320 additions and 2231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
indra/newview/llagent.cpp
View File

@@ -479,7 +479,7 @@ void LLAgent::init()
// LLDebugVarMessageBox::show("Camera Lag", &CAMERA_FOCUS_HALF_LIFE, 0.5f, 0.01f);
mEffectColor = gCOASavedSettings->getColor4("EffectColor");
mEffectColor = gSavedSettings.getColor4("EffectColor");
mInitialized = TRUE;
}
@@ -548,7 +548,7 @@ void LLAgent::resetView(BOOL reset_camera, BOOL change_camera)
gMenuHolder->hideMenus();
}
static LLCachedControl<bool> freeze_time("FreezeTime",false);
static const LLCachedControl<bool> freeze_time("FreezeTime",false);
if (change_camera && !freeze_time)
{
changeCameraToDefault();
@@ -794,7 +794,7 @@ BOOL LLAgent::canFly()
if (isGodlike()) return TRUE;
// <edit>
static LLCachedControl<bool> ascent_fly_always_enabled("AscentFlyAlwaysEnabled",false);
static const LLCachedControl<bool> ascent_fly_always_enabled("AscentFlyAlwaysEnabled",false);
if(ascent_fly_always_enabled)
return TRUE;
// </edit>
@@ -1988,7 +1988,7 @@ void LLAgent::cameraOrbitIn(const F32 meters)
mCameraZoomFraction = (mTargetCameraDistance - meters) / camera_offset_dist;
static LLCachedControl<bool> freeze_time("FreezeTime",false);
static const LLCachedControl<bool> freeze_time("FreezeTime",false);
if (!freeze_time && mCameraZoomFraction < MIN_ZOOM_FRACTION && meters > 0.f)
{
// No need to animate, camera is already there.
@@ -6431,7 +6431,7 @@ void LLAgent::teleportViaLocationLookAt(const LLVector3d& pos_global)
void LLAgent::setTeleportState(ETeleportState state)
{
mTeleportState = state;
static LLCachedControl<bool> freeze_time("FreezeTime",false);
static const LLCachedControl<bool> freeze_time("FreezeTime",false);
if (mTeleportState > TELEPORT_NONE && freeze_time)
{
LLFloaterSnapshot::hide(0);
@@ -7582,7 +7582,7 @@ void LLAgent::sendAgentSetAppearance()
LLColor4 color;
if (!gSavedSettings.getBOOL("AscentStoreSettingsPerAccount"))
{
color = gCOASavedSettings->setColor4("AscentCustomTagColor");
color = gSavedSettings.setColor4("AscentCustomTagColor");
}
else
{