9 files changed, 43 insertions, 48 deletions

diff --git a/linden/indra/llcommon/llversionviewer.h b/linden/indra/llcommon/llversionviewer.h
index c13155a..71b7347 100644
--- a/linden/indra/llcommon/llversionviewer.h
+++ b/linden/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/linden/indra/llmath/llvolume.cpp b/linden/indra/llmath/llvolume.cpp
index 9cad612..4dea085 100644
--- a/linden/indra/llmath/llvolume.cpp
+++ b/linden/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/linden/indra/newview/English.lproj/InfoPlist.strings b/linden/indra/newview/English.lproj/InfoPlist.strings
index 94d1db1..8929cb4 100644
--- a/linden/indra/newview/English.lproj/InfoPlist.strings
+++ b/linden/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/linden/indra/newview/Info-SecondLife.plist b/linden/indra/newview/Info-SecondLife.plist
index cee5a98..0778494 100644
--- a/linden/indra/newview/Info-SecondLife.plist
+++ b/linden/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/linden/indra/newview/llurldispatcher.cpp b/linden/indra/newview/llurldispatcher.cpp
index 7344206..e49e9e5 100644
--- a/linden/indra/newview/llurldispatcher.cpp
+++ b/linden/indra/newview/llurldispatcher.cpp
@@ -196,7 +196,9 @@ bool LLURLDispatcherImpl::dispatchApp(const std::string& url, BOOL right_mouse)
         std::map<std::string, std::string> args;
         args["[SLURL]"] = url;
         gViewerWindow->alertXml("BadURL", args);
-        return false;
+        // This was a SLURL with a /app prefix, and we "handled" it by displaying an error dialog,
+        // so return true.  It doesn't need to be parsed any further.
+        return true;
 }
 
 // static
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 28c5049..2ac9caf 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -6922,7 +6922,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*)
diff --git a/linden/indra/newview/releasenotes.txt b/linden/indra/newview/releasenotes.txt
index a35d512..1c05b15 100644
--- a/linden/indra/newview/releasenotes.txt
+++ b/linden/indra/newview/releasenotes.txt
@@ -1,6 +1,18 @@
-Release Notes for Second Life 1.18.4(2) November 1, 2007
+Release Notes for Second Life 1.18.4(3) November 7, 2007
 =====================================
+New features:
+* Help > Lag Meter; monitors Client, Network and Server lag and reports possible causes
+
+Changes:
+* Visual changes in preparation for a forthcoming release of new in-world search
+** Opt-in and opt-out checkboxes for Resident Profile, Parcels, For Sale Objects, Not For Sale Objects, Regions, and Groups 
+* About Land description field is now a three-line text box
+* Minimap indicators for "above" and "below" updated
+** After the next server update, friends will appear in a different color
+
 Bug fixes:
+* Fixed a sculptie LOD issue
+* Fixed region Mature setting reverting to PG after Estate/Region changes
 * Fixed several UI elements
 * Fixed new group not appearing in group window until relog
 * Fixed Trash folders in user inventory
@@ -15,34 +27,6 @@ Bug fixes:
 * Fixed Publish on Web not saving for parcels
 * Fixed missing dialog for Publish in Classifieds
 * Fixed updates for Land and L$
-
-Release Notes for Second Life 1.18.4(1) October 26, 2007
-=====================================
-Bug fixes:
-* Crash on startup (due to empty list of rewritten login URIs)
-* Viewer crash while trying to rez an object
-* Crash when editing classifieds
-* Land & L$ fields no longer update
-* Minimizing the search window followed by Ctrl+F crashes
-* Parcel option doesnt save publish listing on the web setting
-* Texture editing user interface is confusing
-* Can.t set Repeats Per Face with up/down arrows
-* Auction ID and Land Description Overlap in the .About Land. window
-
-
-Release Notes for Second Life 1.18.4(0) October 17, 2007
-=====================================
-New features:
-* Help > Lag Meter; monitors Client, Network and Server lag and reports possible causes
-
-Changes:
-* Visual changes in preparation for a forthcoming release of new in-world search
-** Opt-in and opt-out checkboxes for Resident Profile, Parcels, For Sale Objects, Not For Sale Objects, Regions, and Groups 
-* About Land description field is now a three-line text box
-* Minimap indicators for "above" and "below" updated
-** After the next server update, friends will appear in a different color
-
-Bug fixes:
 * Fixed invisible sculpted prims when sculpted texture contains alpha
 * Fixed scope of drag-select with locked objects
 * Fixed link order of drag-selected objects
@@ -62,6 +46,15 @@ Bug fixes:
 * Fixed Group enrollment fee accepting floating point
 * Fixed 'Quiet Snapshots to Disk' and 'Disable Camera Constraints' not persisting across sessions
 * Fixed dot characters in various fields
+* Fixed a crash on startup (due to empty list of rewritten login URIs)
+* Fixed a Viewer crash while trying to rez an object
+* Fixed a crash when editing classifieds
+* Fixed Land & L$ fields no longer update
+* Fixed a crash by minimizing the search window followed by Ctrl+F
+* Fixed parcel option doesnt save publish listing on the web setting
+* Fixed texture editing user interface is confusing
+* Fixed can't set Repeats Per Face with up/down arrows
+* Fixed Auction ID and Land Description Overlap in the 'About Land' window
 * Disabled Add to Outfit and Replace Outfit options on the top-level Clothing folder
 * MISC-567: Multiple system folders (e.g., '100 Lost and Found Folders') in inventory
 * VWR-2471: SL-viewer chrashes after opening the 10th group-info-window
diff --git a/linden/indra/newview/res/newViewRes.rc b/linden/indra/newview/res/newViewRes.rc
index 8d152fa..ccb649a 100644
--- a/linden/indra/newview/res/newViewRes.rc
+++ b/linden/indra/newview/res/newViewRes.rc
@@ -227,8 +227,8 @@ TOOLPIPETTE             CURSOR                  "toolpipette.cur"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,18,4,2
- PRODUCTVERSION 1,18,4,2
+ FILEVERSION 1,18,4,3
+ PRODUCTVERSION 1,18,4,3
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -245,12 +245,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Linden Lab"
             VALUE "FileDescription", "Second Life"
-            VALUE "FileVersion", "1.18.4.2"
+            VALUE "FileVersion", "1.18.4.3"
             VALUE "InternalName", "Second Life"
             VALUE "LegalCopyright", "Copyright © 2001-2007, Linden Research, Inc."
             VALUE "OriginalFilename", "SecondLife.exe"
             VALUE "ProductName", "Second Life"
-            VALUE "ProductVersion", "1.18.4.2"
+            VALUE "ProductVersion", "1.18.4.3"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/linden/indra/newview/skins/xui/en-us/alerts.xml b/linden/indra/newview/skins/xui/en-us/alerts.xml
index 9bca7d5..0bad2fc 100644
--- a/linden/indra/newview/skins/xui/en-us/alerts.xml
+++ b/linden/indra/newview/skins/xui/en-us/alerts.xml
@@ -4463,14 +4463,15 @@ the contents of your Lost And Found folder?
         </alert>
                 <alert modal="true" name="BadURL">
                 <message name="message">
-                        Second Life doesn't know how to handle the link:
-                        
+Second Life doesn't know how to handle the link:
+
 [SLURL]
-                        
+
 Most links are similar to this:
-                        
-secondlife://app/agent/0e346d8b-4433-4d66-a6b0-fd37083abc4c/about
-                        
+
+secondlife:///app/agent/0e346d8b-4433-4d66-a6b0-
+fd37083abc4c/about
+
 Please check the spelling and try again.
                 </message>
         </alert>