Result of svn merge -r64890:69433 svn+ssh://svn/svn/linden/branches/dpo-4 into release. had to blow away the libraries directory to clear up svn evil.

6 files changed, 15 insertions, 6 deletions

diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index e622664aad..e3ef269a68 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.3.2";
-CFBundleGetInfoString = "Second Life version 1.18.3.2, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.2.46464";
+CFBundleGetInfoString = "Second Life version 1.18.2.46464, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index f4ac5c6a61..3c7d18078b 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.3.2</string>
+	<string>1.18.2.46464</string>
 	<key>CSResourcesFileMapped</key>
 	<true/>
 </dict>
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index f0d6d2d0b1..20f00e297d 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -699,7 +699,15 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
 
 BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
 {
-	preview();
+	if (mListener->getInventoryType() == LLInventoryType::IT_LANDMARK) 
+	{
+		gFocusMgr.setKeyboardFocus(NULL, NULL); // release focus to main window so user can move with arrow keys
+		mListener->performAction(NULL, &gInventory, "teleport");
+	}
+	else
+	{
+		preview();
+	}
 	return TRUE;
 }
 
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index c6f94841cb..1d9c848dc3 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4232,7 +4232,6 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
 			no_open = (item->getType() == LLAssetType::AT_CLOTHING) ||
 					  (item->getType() == LLAssetType::AT_BODYPART);
 		}
-
 		if (!no_open)
 		{
 			items.push_back("Open");
diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp
index baeee12e7e..944251ac07 100644
--- a/indra/newview/llpanelgroupgeneral.cpp
+++ b/indra/newview/llpanelgroupgeneral.cpp
@@ -790,7 +790,6 @@ void LLPanelGroupGeneral::updateMembers()
 	}
 }
 
-
 void LLPanelGroupGeneral::updateChanged()
 {
 	mChanged = FALSE;
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index f907ac698e..ae28df7922 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -73,6 +73,7 @@
 #include "llimpanel.h"
 #include "llinventorymodel.h"
 #include "llinventoryview.h"
+#include "llkeyframemotion.h" 
 #include "llmenugl.h"
 #include "llmutelist.h"
 #include "llnetmap.h"
@@ -2694,6 +2695,8 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**)
 
 	llinfos << "Changing home region to " << x << ":" << y << llendl;
 
+	LLKeyframeDataCache::clear();
+
 	// set our upstream host the new simulator and shuffle things as
 	// appropriate.
 	LLVector3 shift_vector = regionp->getPosRegionFromGlobal(