livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

svn merge -r 58859:58902 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release

master
Josh Bell 2007-03-08 00:25:12 +00:00
parent a00d02efef
commit 6fa974fc64
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llwindow/llkeyboardwin32.cpp
View File

@ -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;

2
indra/newview/linux_tools/wrapper.sh
View File

@ -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 '*********************************************************'

4
indra/newview/llstartup.cpp
View File

@ -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();

6
indra/newview/llxmlrpctransaction.cpp
View File

@ -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 =

3
indra/newview/pipeline.cpp
View File

@ -109,9 +109,6 @@ S32 gTrivialAccepts = 0;
BOOL gRenderForSelect = FALSE;
BOOL gUsePickAlpha = TRUE;
F32 gPickAlphaThreshold = 0.2f;
//glsl parameter tables
const char* LLPipeline::sReservedAttribs[] =
{

2
indra/newview/pipeline.h
View File

@ -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

2
indra/newview/viewer_manifest.py
View File

@ -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")