diff options
| -rw-r--r-- | indra/llwindow/llkeyboardwin32.cpp | 5 | ||||
| -rwxr-xr-x | indra/newview/linux_tools/wrapper.sh | 2 | ||||
| -rw-r--r-- | indra/newview/llstartup.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llxmlrpctransaction.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/pipeline.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/pipeline.h | 2 | ||||
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 2 |
7 files changed, 10 insertions, 14 deletions
diff --git a/indra/llwindow/llkeyboardwin32.cpp b/indra/llwindow/llkeyboardwin32.cpp index 448345eeeb..6c7662f5a9 100644 --- a/indra/llwindow/llkeyboardwin32.cpp +++ b/indra/llwindow/llkeyboardwin32.cpp @@ -168,10 +168,7 @@ MASK LLKeyboardWin32::updateModifiers() // Scan the modifier keys as of the last Windows key message // (keydown encoded in high order bit of short) - //setModifierKeyLevel( KEY_SHIFT, GetKeyState(VK_SHIFT) & 0x8000 ); - //setModifierKeyLevel( KEY_CONTROL, GetKeyState(VK_CONTROL) & 0x8000 ); - //setModifierKeyLevel( KEY_ALT, GetKeyState(VK_MENU) & 0x8000 ); - //setModifierKeyLevel( KEY_CAPSLOCK, GetKeyState(VK_CAPITAL) & 0x0001); // Low order bit carries the toggle state. + mKeyLevel[KEY_CAPSLOCK] = (GetKeyState(VK_CAPITAL) & 0x0001) != 0; // Low order bit carries the toggle state. // Get mask for keyboard events MASK mask = currentMask(FALSE); return mask; diff --git a/indra/newview/linux_tools/wrapper.sh b/indra/newview/linux_tools/wrapper.sh index 3fd59eb87c..cdc36a8375 100755 --- a/indra/newview/linux_tools/wrapper.sh +++ b/indra/newview/linux_tools/wrapper.sh @@ -39,7 +39,7 @@ export SDL_VIDEO_X11_DGAMOUSE=0 RUN_PATH=`dirname "$0" || echo .` cd "${RUN_PATH}" -LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat +LD_LIBRARY_PATH="`pwd`"/lib:"`pwd`"/app_settings/mozilla-runtime-linux-i686:"${LD_LIBRARY_PATH}" bin/do-not-directly-run-secondlife-bin `cat gridargs.dat` $@ | cat echo echo '*********************************************************' diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 421e836f93..e6c6576ae1 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -488,6 +488,10 @@ BOOL idle_startup() #else profileBaseDir += "mozilla"; #endif + #elif LL_LINUX + std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); + profileBaseDir += gDirUtilp->getDirDelimiter(); + profileBaseDir += "mozilla-runtime-linux-i686"; #else std::string profileBaseDir( gDirUtilp->getExpandedFilename( LL_PATH_APP_SETTINGS, "" ) ); profileBaseDir += gDirUtilp->getDirDelimiter(); diff --git a/indra/newview/llxmlrpctransaction.cpp b/indra/newview/llxmlrpctransaction.cpp index cc8f955bc6..c00a202f91 100644 --- a/indra/newview/llxmlrpctransaction.cpp +++ b/indra/newview/llxmlrpctransaction.cpp @@ -408,9 +408,9 @@ void LLXMLRPCTransaction::Impl::setStatus(Status status, mStatusMessage = "Despite our best efforts, something unexpected has gone wrong. \n" " \n" - "Please check www.secondlife.com/status and the Second Life \n" - "Announcements forum to see if there is a known problem with \n" - "the service."; + "Please check www.secondlife.com/status \n" + "to see if there is a known problem with the service."; + mStatusURI = "http://secondlife.com/status/"; /* mStatusMessage = diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 4108298dfd..250b9bc7df 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -109,9 +109,6 @@ S32 gTrivialAccepts = 0; BOOL gRenderForSelect = FALSE; -BOOL gUsePickAlpha = TRUE; -F32 gPickAlphaThreshold = 0.2f; - //glsl parameter tables const char* LLPipeline::sReservedAttribs[] = { diff --git a/indra/newview/pipeline.h b/indra/newview/pipeline.h index af772fd60d..c744a29bec 100644 --- a/indra/newview/pipeline.h +++ b/indra/newview/pipeline.h @@ -651,7 +651,5 @@ void render_bbox(const LLVector3 &min, const LLVector3 &max); extern LLPipeline gPipeline; extern BOOL gRenderForSelect; -extern F32 gPickAlphaThreshold; -extern BOOL gUsePickAlpha; #endif diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index baa023cd4e..301ab310d9 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -388,7 +388,7 @@ class Linux_i686Manifest(LinuxManifest): # recurse self.end_prefix("res-sdl") - self.path("app_settings/mozilla-runtime-linux-i686", "app_settings/mozilla") + self.path("app_settings/mozilla-runtime-linux-i686") if self.prefix("../../libraries/i686-linux/lib_release_client", "lib"): self.path("libkdu_v42R.so") |