diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-12-03 21:41:38 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-12-03 21:41:38 +0000 |
| commit | 90aa2ddb2efede12f12011fc163e3007e3ba7104 (patch) | |
| tree | 02677b5d5dbca2a5f2d650c4cecd6d7d056147bc | |
| parent | f41b7bb8dff075d8c32ea03be407d20fe11e71f3 (diff) | |
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
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/llpanelplace.cpp | 7 |
4 files changed, 4 insertions, 11 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index e24c38bba8..1df8a89908 100644 --- a/indra/llcommon/llversionviewer.h +++ b/indra/llcommon/llversionviewer.h @@ -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"; diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 9dfdda9345..da8951428a 100644 --- a/indra/newview/English.lproj/InfoPlist.strings +++ b/indra/newview/English.lproj/InfoPlist.strings @@ -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."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index fac66b8ee4..427651ccba 100644 --- a/indra/newview/Info-SecondLife.plist +++ b/indra/newview/Info-SecondLife.plist @@ -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> diff --git a/indra/newview/llpanelplace.cpp b/indra/newview/llpanelplace.cpp index 8825ce71fc..a05f7129ae 100644 --- a/indra/newview/llpanelplace.cpp +++ b/indra/newview/llpanelplace.cpp @@ -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); |