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

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
master
Steven Bennetts 2007-11-08 18:59:20 +00:00
parent 0771e39d20
commit 760f2ceb15
5 changed files with 7 additions and 8 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 = 4;
const S32 LL_VERSION_BUILD = 2;
const S32 LL_VERSION_BUILD = 3;
const char * const LL_CHANNEL = "Second Life Release";

5
indra/llmath/llvolume.cpp
View File

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

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.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.";

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

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

2
indra/newview/llviewermenu.cpp
View File

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