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

Fix for Issue 694, use gSavedSettings instead of restricting globals.

Browse Source 
Removes gAllowTapTapHoldRun and not much else we may want to remove a few more in the future, though.
This commit is contained in:
Lirusaito
2013-03-12 01:04:09 -04:00
parent 06a73061ce
commit ca71bf00c2
4 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
indra/newview/llappviewer.cpp
View File

@@ -243,7 +243,6 @@ const F32 DEFAULT_AFK_TIMEOUT = 5.f * 60.f; // time with no input before user fl
F32 gSimLastTime; // Used in LLAppViewer::init and send_stats() F32 gSimLastTime; // Used in LLAppViewer::init and send_stats()
F32 gSimFrames; F32 gSimFrames;
BOOL gAllowTapTapHoldRun = TRUE;
BOOL gShowObjectUpdates = FALSE; BOOL gShowObjectUpdates = FALSE;
BOOL gUseQuickTime = TRUE; BOOL gUseQuickTime = TRUE;
@@ -283,9 +282,6 @@ LLUUID gSystemFolderAssets;
BOOL gDisconnected = FALSE; BOOL gDisconnected = FALSE;
// Minimap scale in pixels per region
// used to restore texture state after a mode switch // used to restore texture state after a mode switch
LLFrameTimer gRestoreGLTimer; LLFrameTimer gRestoreGLTimer;
BOOL gRestoreGL = FALSE; BOOL gRestoreGL = FALSE;
@@ -322,9 +318,6 @@ const std::string ERROR_MARKER_FILE_NAME("Singularity.error_marker");
const std::string LLERROR_MARKER_FILE_NAME("Singularity.llerror_marker"); const std::string LLERROR_MARKER_FILE_NAME("Singularity.llerror_marker");
const std::string LOGOUT_MARKER_FILE_NAME("Singularity.logout_marker"); const std::string LOGOUT_MARKER_FILE_NAME("Singularity.logout_marker");
static BOOL gDoDisconnect = FALSE; static BOOL gDoDisconnect = FALSE;
// <edit>
//static BOOL gBusyDisconnect = FALSE;
// </edit>
static std::string gLaunchFileOnQuit; static std::string gLaunchFileOnQuit;
// Used on Win32 for other apps to identify our window (eg, win_setup) // Used on Win32 for other apps to identify our window (eg, win_setup)
@@ -489,6 +482,7 @@ static void settings_to_globals()
LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize")); LLSurface::setTextureSize(gSavedSettings.getU32("RegionTextureSize"));
LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLCoreProfile"); LLRender::sGLCoreProfile = gSavedSettings.getBOOL("RenderGLCoreProfile");
LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic"); LLImageGL::sGlobalUseAnisotropic = gSavedSettings.getBOOL("RenderAnisotropic");
LLImageGL::sCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures"); LLImageGL::sCompressTextures = gSavedSettings.getBOOL("RenderCompressTextures");
LLVOVolume::sLODFactor = gSavedSettings.getF32("RenderVolumeLODFactor"); LLVOVolume::sLODFactor = gSavedSettings.getF32("RenderVolumeLODFactor");
@@ -512,7 +506,6 @@ static void settings_to_globals()
gAgent.setHideGroupTitle(gSavedSettings.getBOOL("RenderHideGroupTitle")); gAgent.setHideGroupTitle(gSavedSettings.getBOOL("RenderHideGroupTitle"));
gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc"); gDebugWindowProc = gSavedSettings.getBOOL("DebugWindowProc");
gAllowTapTapHoldRun = gSavedSettings.getBOOL("AllowTapTapHoldRun");
gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates"); gShowObjectUpdates = gSavedSettings.getBOOL("ShowObjectUpdates");
LLWorldMapView::sMapScale = llmax(.1f,gSavedSettings.getF32("MapScale")); LLWorldMapView::sMapScale = llmax(.1f,gSavedSettings.getF32("MapScale"));
LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips"); LLHoverView::sShowHoverTips = gSavedSettings.getBOOL("ShowHoverTips");
@@ -2697,25 +2690,15 @@ void LLAppViewer::cleanupSavedSettings()
{ {
gSavedSettings.setBOOL("MouseSun", FALSE); gSavedSettings.setBOOL("MouseSun", FALSE);
gSavedSettings.setBOOL("FlyBtnState", FALSE);
gSavedSettings.setBOOL("FirstPersonBtnState", FALSE);
gSavedSettings.setBOOL("ThirdPersonBtnState", TRUE);
gSavedSettings.setBOOL("BuildBtnState", FALSE);
gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator gSavedSettings.setBOOL("UseEnergy", TRUE); // force toggle to turn off, since sends message to simulator
gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc); gSavedSettings.setBOOL("DebugWindowProc", gDebugWindowProc);
gSavedSettings.setBOOL("AllowTapTapHoldRun", gAllowTapTapHoldRun);
gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates); gSavedSettings.setBOOL("ShowObjectUpdates", gShowObjectUpdates);
if (!gNoRender) if (!gNoRender && gDebugView)
{ {
if (gDebugView) gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible());
{
gSavedSettings.setBOOL("ShowDebugConsole", gDebugView->mDebugConsolep->getVisible());
}
} }
// save window position if not fullscreen // save window position if not fullscreen

7
indra/newview/llappviewer.h
View File

@@ -37,11 +37,11 @@
#include "llsys.h" // for LLOSInfo #include "llsys.h" // for LLOSInfo
#include "llviewercontrol.h" // settings_map_type #include "llviewercontrol.h" // settings_map_type
class LLCommandLineParser;
class LLTextureCache; class LLTextureCache;
class LLImageDecodeThread; class LLImageDecodeThread;
class LLTextureFetch; class LLTextureFetch;
class LLWatchdogTimeout; class LLWatchdogTimeout;
class LLCommandLineParser;
class LLAppViewer : public LLApp class LLAppViewer : public LLApp
{ {
@@ -278,14 +278,11 @@ const S32 AGENT_UPDATES_PER_SECOND = 10;
// "// llstartup" indicates that llstartup is the only client for this global. // "// llstartup" indicates that llstartup is the only client for this global.
extern LLSD gDebugInfo; extern LLSD gDebugInfo;
extern BOOL gAllowTapTapHoldRun;
extern BOOL gShowObjectUpdates; extern BOOL gShowObjectUpdates;
extern BOOL gAcceptTOS; extern BOOL gAcceptTOS;
extern BOOL gAcceptCriticalMessage; extern BOOL gAcceptCriticalMessage;
typedef enum typedef enum
{ {
LAST_EXEC_NORMAL = 0, LAST_EXEC_NORMAL = 0,
@@ -332,8 +329,6 @@ extern LLUUID gSystemFolderAssets;
extern BOOL gDisconnected; extern BOOL gDisconnected;
// Minimap scale in pixels per region
extern LLFrameTimer gRestoreGLTimer; extern LLFrameTimer gRestoreGLTimer;
extern BOOL gRestoreGL; extern BOOL gRestoreGL;
extern BOOL gUseWireframe; extern BOOL gUseWireframe;

2
indra/newview/llviewerkeyboard.cpp
View File

@@ -117,7 +117,7 @@ static void agent_handle_doubletap_run(EKeystate s, LLAgent::EDoubleTapRunMode m
gAgent.clearTempRun(); gAgent.clearTempRun();
// [/RLVa:KB] // [/RLVa:KB]
} }
else if (gAllowTapTapHoldRun && else if (gSavedSettings.getBOOL("AllowTapTapHoldRun") &&
KEYSTATE_DOWN == s && KEYSTATE_DOWN == s &&
!gAgent.getRunning()) !gAgent.getRunning())
{ {

2
indra/newview/llviewermenu.cpp
View File

@@ -1667,7 +1667,7 @@ void init_debug_avatar_menu(LLMenuGL* menu)
menu->addChild(sub_menu); menu->addChild(sub_menu);
menu->addChild(new LLMenuItemToggleGL("Tap-Tap-Hold To Run", &gAllowTapTapHoldRun)); menu->addChild(new LLMenuItemCheckGL("Tap-Tap-Hold To Run", menu_toggle_control, NULL, menu_check_control, (void*)"AllowTapTapHoldRun"));
menu->addChild(new LLMenuItemCallGL("Force Params to Default", &LLAgent::clearVisualParams, NULL)); menu->addChild(new LLMenuItemCallGL("Force Params to Default", &LLAgent::clearVisualParams, NULL));
menu->addChild(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL)); menu->addChild(new LLMenuItemCallGL("Reload Vertex Shader", &reload_vertex_shader, NULL));
menu->addChild(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug)); menu->addChild(new LLMenuItemToggleGL("Animation Info", &LLVOAvatar::sShowAnimationDebug));