svn merge -r76651:76807 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-18-6-Viewer --> release

Pick up fixes for:
* DEV-7598 VWR-3829: Cursor in Logon edit boxes difficult to see
* DEV-8125 Language names need to have a consistent format in preferences drop-down
* DEV-8099 SVC-1125: New Search: Beacons aren't shown when teleporting to regions with "Allow Direct Teleport" disabled
* DEV-8107 Crash when connecting to older sims in llviewerparcelmgr age verification code
* DEV-8130 Remove "Alternate Server" option from crash reporter since util.* no longer have public interfaces
* DEV-7372 VWR-3748: Builds fail on 1.18.6 RC if not using MOZLIB due to missing #if LL_LIBXUL_ENABLED in 3 places in indra/newview/llpanellogin.cpp

Plus corrected line endings for llcrashlogger.* (there's one actual change in those files, the rest is whitespace)

6 files changed, 27 insertions, 12 deletions

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index a4383ffbeb..dff6ab4cbb 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.6.2";
-CFBundleGetInfoString = "Second Life version 1.18.6.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.6.3";
+CFBundleGetInfoString = "Second Life version 1.18.6.3, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index c753469212..73117e1e06 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.6.2</string>
+	<string>1.18.6.3</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp
index 7e97622c8b..2cac860423 100644
--- a/indra/newview/llpanellogin.cpp
+++ b/indra/newview/llpanellogin.cpp
@@ -526,6 +526,7 @@ void LLPanelLogin::show(const LLRect &rect,
 {
 	new LLPanelLogin(rect, show_server, callback, callback_data); 
 
+#if LL_LIBXUL_ENABLED
 	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
 	
 	if (!web_browser) return;
@@ -538,6 +539,7 @@ void LLPanelLogin::show(const LLRect &rect,
 
 	// Make sure that focus always goes here (and use the latest sInstance that was just created)
 	gFocusMgr.setDefaultKeyboardFocus(web_browser);
+#endif
 }
 
 
@@ -560,12 +562,14 @@ void LLPanelLogin::setAlwaysRefresh(bool refresh)
 {
 	if (LLStartUp::getStartupState() >= STATE_LOGIN_CLEANUP) return;
 
+#if LL_LIBXUL_ENABLED
 	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
 
 	if (web_browser)
 	{
 		web_browser->setAlwaysRefresh(refresh);
 	}
+#endif
 }
 
 
@@ -576,8 +580,6 @@ void LLPanelLogin::loadLoginPage()
 
 	LLURLSimString::sInstance.parse();
 
-	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
-
 	std::ostringstream oStr;
 
 	LLString location;
@@ -689,8 +691,12 @@ void LLPanelLogin::loadLoginPage()
 		oStr << "&show_grid=TRUE";
 #endif
 	
+#if LL_LIBXUL_ENABLED
+	LLWebBrowserCtrl* web_browser = LLUICtrlFactory::getWebBrowserCtrlByName(sInstance, "login_html");
+	
 	// navigate to the "real" page 
 	web_browser->navigateTo( oStr.str() );
+#endif
 }
 
 #if LL_LIBXUL_ENABLED
diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp
index f8ebced8b9..6fec904239 100644
--- a/indra/newview/llurldispatcher.cpp
+++ b/indra/newview/llurldispatcher.cpp
@@ -38,6 +38,7 @@
 #include "llfloaterurldisplay.h"
 #include "llfloaterdirectory.h"
 #include "llfloaterhtml.h"
+#include "llfloaterworldmap.h"
 #include "llpanellogin.h"
 #include "llstartup.h"			// gStartupState
 #include "llurlsimstring.h"
@@ -238,12 +239,17 @@ void LLURLDispatcherImpl::regionHandleCallback(U64 region_handle, const std::str
 		LLVector3d global_pos = from_region_handle(region_handle);
 		global_pos += LLVector3d(local_pos);
 		gAgent.teleportViaLocation(global_pos);
+		if(gFloaterWorldMap)
+		{
+			gFloaterWorldMap->trackLocation(global_pos);
+		}
 	}
 	else
 	{
 		// display informational floater, allow user to click teleport btn
 		LLFloaterURLDisplay* url_displayp = LLFloaterURLDisplay::getInstance(LLSD());
 
+
 		url_displayp->displayParcelInfo(region_handle, local_pos);
 		if(snapshot_id.notNull())
 		{
diff --git a/indra/newview/llviewerparcelmgr.cpp b/indra/newview/llviewerparcelmgr.cpp
index 2844cf9356..eaea0438fa 100644
--- a/indra/newview/llviewerparcelmgr.cpp
+++ b/indra/newview/llviewerparcelmgr.cpp
@@ -1475,7 +1475,11 @@ void LLViewerParcelMgr::processParcelProperties(LLMessageSystem *msg, void **use
 	msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_RegionDenyAnonymous, region_deny_anonymous_override );
 	msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_RegionDenyIdentified, region_deny_identified_override ); // Deprecated
 	msg->getBOOLFast(_PREHASH_ParcelData, _PREHASH_RegionDenyTransacted, region_deny_transacted_override ); // Deprecated
-	msg->getBOOLFast(_PREHASH_AgeVerificationBlock, _PREHASH_RegionDenyAgeUnverified, region_deny_age_unverified_override );
+	if (msg->getNumberOfBlocksFast(_PREHASH_AgeVerificationBlock))
+	{
+		// this block was added later and may not be on older sims, so we have to test its existence first
+		msg->getBOOLFast(_PREHASH_AgeVerificationBlock, _PREHASH_RegionDenyAgeUnverified, region_deny_age_unverified_override );
+	}
 
 	msg->getS32("ParcelData", "OtherCleanTime", other_clean_time );
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 5775af68a1..abd3b269f6 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -80,12 +80,11 @@ class ViewerManifest(LLManifest):
                         self.path('words.*.txt')
 
                         # Local HTML files (e.g. loading screen)
-                        if self.prefix("html/*"):
-                                self.path("*.html")
-                                self.path("*.gif")
-                                self.path("*.jpg")
-                                self.path("*.css")
-                                self.end_prefix("html/*")
+                        if self.prefix(src="html"):
+                                self.path("*.png")
+                                self.path("*/*/*.html")
+                                self.path("*/*/*.gif")
+                                self.end_prefix("html")
                         self.end_prefix("skins")
 
                 self.path("releasenotes.txt")