merge.

3 files changed, 12 insertions, 61 deletions

diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 88b4c34e2b..6b816f8786 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -307,59 +307,6 @@ void update_texture_fetch()
 	gTextureList.updateImages(0.10f);
 }
 
-//Copies landmarks from the "Library" to "My Favorites"
-void populate_favorites_bar()
-{
-	//*TODO consider extending LLInventoryModel::findCategoryUUIDForType(...) to support both root's
-	LLInventoryModel::cat_array_t* lib_cats = NULL;
-	LLInventoryModel::item_array_t* lib_items = NULL;
-	gInventory.getDirectDescendentsOf(gInventory.getLibraryRootFolderID(), lib_cats, lib_items);
-	if (!lib_cats) return;
-
-	LLUUID lib_landmarks(LLUUID::null);
-	S32 count = lib_cats->count();
-	for(S32 i = 0; i < count; ++i)
-	{
-		if(lib_cats->get(i)->getPreferredType() == LLFolderType::FT_LANDMARK)
-		{
-			lib_landmarks = lib_cats->get(i)->getUUID();
-			break;
-		}
-	}
-	if (lib_landmarks.isNull())
-	{
-		llerror("Library inventory is missing Landmarks", 0);
-		return;
-	}
-
-	LLInventoryModel::cat_array_t* lm_cats = NULL;
-	LLInventoryModel::item_array_t* lm_items = NULL;
-	gInventory.getDirectDescendentsOf(lib_landmarks, lm_cats, lm_items);
-	if (!lm_items) return;
-
-	const LLUUID favorites_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_FAVORITE);
-	if (favorites_id.isNull())
-	{
-		llerror("My Inventory is missing My Favorites", 0);
-		return;
-	}
-
-	S32 lm_count = lm_items->count();
-	for (S32 i = 0; i < lm_count; ++i)
-	{
-		LLInventoryItem* item = lm_items->get(i);
-		if (item->getUUID().isNull()) continue;
-
-		copy_inventory_item(gAgent.getID(),
-			item->getPermissions().getOwner(),
-			item->getUUID(),
-			favorites_id,
-			std::string(),
-			LLPointer<LLInventoryCallback>(NULL));
-	}
-}
-
-
 // Returns false to skip other idle processing. Should only return
 // true when all initialization done.
 bool idle_startup()
@@ -1705,12 +1652,6 @@ bool idle_startup()
 		llinfos << "Creating Inventory Views" << llendl;
 		LLFloaterReg::getInstance("inventory");
 
-		//default initial content for Favorites Bar 
-		if (gAgent.isFirstLogin())
-		{
-			populate_favorites_bar();
-		}
-
 		LLStartUp::setStartupState( STATE_MISC );
 		return FALSE;
 	}
diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp
index e9f5132989..34e1bcdd1f 100644
--- a/indra/newview/llvovolume.cpp
+++ b/indra/newview/llvovolume.cpp
@@ -1927,12 +1927,22 @@ void LLVOVolume::mediaNavigateBounceBack(U8 texture_index)
 	if (mep && impl)
 	{
         std::string url = mep->getCurrentURL();
+		// Look for a ":", if not there, assume "http://"
+		if (!url.empty() && std::string::npos == url.find(':')) 
+		{
+			url = "http://" + url;
+		}
 		// If the url we're trying to "bounce back" to is either empty or not
 		// allowed by the whitelist, try the home url.  If *that* doesn't work,
 		// set the media as failed and unload it
         if (url.empty() || !mep->checkCandidateUrl(url))
         {
             url = mep->getHomeURL();
+			// Look for a ":", if not there, assume "http://"
+			if (!url.empty() && std::string::npos == url.find(':')) 
+			{
+				url = "http://" + url;
+			}
         }
         if (url.empty() || !mep->checkCandidateUrl(url))
 		{
diff --git a/install.xml b/install.xml
index 362eb03db8..b9abfb782c 100644
--- a/install.xml
+++ b/install.xml
@@ -1225,9 +1225,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>linux</key>
           <map>
             <key>md5sum</key>
-            <string>c8223e9454223e3d519fe40d71c3ddd2</string>
+            <string>75a7004ab14bea46594b1c652f1a6040</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20091216-56cc0386.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/openal-linux-20100120-3ad86a1c.tar.bz2</uri>
           </map>
           <key>linux64</key>
           <map>