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

svn merge -r 74415:74849 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-5-Viewer --> release 

Last of the fixes from 1.18.5 Viewer RC series
master
Josh Bell 2007-12-03 21:41:38 +00:00
parent f41b7bb8df
commit 90aa2ddb2e
4 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llversionviewer.h
View File

@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 18;
const S32 LL_VERSION_PATCH = 5;
const S32 LL_VERSION_BUILD = 2;
const S32 LL_VERSION_BUILD = 3;
const char * const LL_CHANNEL = "Second Life Release";

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Second Life";
CFBundleShortVersionString = "Second Life version 1.18.5.2";
CFBundleGetInfoString = "Second Life version 1.18.5.2, Copyright 2004-2007 Linden Research, Inc.";
CFBundleShortVersionString = "Second Life version 1.18.5.3";
CFBundleGetInfoString = "Second Life version 1.18.5.3, Copyright 2004-2007 Linden Research, Inc.";

2
indra/newview/Info-SecondLife.plist
View File

@ -32,7 +32,7 @@
</dict>
</array>
<key>CFBundleVersion</key>
<string>1.18.5.2</string>
<string>1.18.5.3</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>

7
indra/newview/llpanelplace.cpp
View File

@ -390,13 +390,6 @@ void LLPanelPlace::onClickTeleport(void* data)
void LLPanelPlace::onClickMap(void* data)
{
LLPanelPlace* self = (LLPanelPlace*)data;
LLView* parent_viewp = self->getParent();
if (parent_viewp->getWidgetType() == WIDGET_TYPE_FLOATER)
{
LLFloater* parent_floaterp = (LLFloater*)parent_viewp;
parent_floaterp->close();
}
if (!self->mPosGlobal.isExactlyZero())
{
gFloaterWorldMap->trackLocation(self->mPosGlobal);