diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-11-08 18:59:20 +0000 |
| commit | 760f2ceb1518d87e865f25ac87a540625e974517 (patch) | |
| tree | 0367941c9719c9d97f70a7c33094dcdeeea60224 /indra | |
| parent | 0771e39d20ee1475b8bf1458ef87e2b82aaa4e02 (diff) | |
svn merge -r 72877:73187 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-4-Viewer --> release
Backport patches and translations from RC branch
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llcommon/llversionviewer.h | 2 | ||||
| -rw-r--r-- | indra/llmath/llvolume.cpp | 5 | ||||
| -rw-r--r-- | indra/newview/English.lproj/InfoPlist.strings | 4 | ||||
| -rw-r--r-- | indra/newview/Info-SecondLife.plist | 2 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 2 |
5 files changed, 7 insertions, 8 deletions
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h index c13155aeb5..71b7347c4a 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 = 4; -const S32 LL_VERSION_BUILD = 2; +const S32 LL_VERSION_BUILD = 3; const char * const LL_CHANNEL = "Second Life Release"; diff --git a/indra/llmath/llvolume.cpp b/indra/llmath/llvolume.cpp index 9cad612f24..4dea08505d 100644 --- a/indra/llmath/llvolume.cpp +++ b/indra/llmath/llvolume.cpp @@ -1894,11 +1894,10 @@ void LLVolume::sculpt(U16 sculpt_width, U16 sculpt_height, S8 sculpt_components, // compute the area of the parallelogram by taking the length of the cross product: // (parallegram is an approximation of two triangles) LLVector3 cross = (p1 - p2) % (p1 - p3); - // take length squared for efficiency (no sqrt) - area += cross.magVecSquared(); + area += cross.magVec(); } - if (area < SCULPT_MIN_AREA * SCULPT_MIN_AREA) + if (area < SCULPT_MIN_AREA) data_is_empty = TRUE; } diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings index 94d1db1798..8929cb4226 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.4.2"; -CFBundleGetInfoString = "Second Life version 1.18.4.2, Copyright 2004-2007 Linden Research, Inc."; +CFBundleShortVersionString = "Second Life version 1.18.4.3"; +CFBundleGetInfoString = "Second Life version 1.18.4.3, Copyright 2004-2007 Linden Research, Inc."; diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist index cee5a98bff..0778494394 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.4.2</string> + <string>1.18.4.3</string> <key>CSResourcesFileMapped</key> <true/> </dict> diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index c052d18f0b..be595e616c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7132,7 +7132,7 @@ void handle_load_from_xml(void*) void handle_slurl_test(void*) { - LLFloaterHtml::getInstance()->show("http://user.lindenlab.com/~james/slurl.html", "SLURL Test"); + LLFloaterHtml::getInstance()->show("http://secondlife.com/app/search/slurls.html", "SLURL Test"); } void handle_rebake_textures(void*) |