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.

11 files changed, 31 insertions, 22 deletions

diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index 304de4c6d1..d8a4acecc1 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1838,8 +1838,7 @@ void LLKeyframeMotion::setEaseOut(F32 ease_in)
 //-----------------------------------------------------------------------------
 void LLKeyframeMotion::flushKeyframeCache()
 {
-	// TODO: Make this safe to do
-// 	LLKeyframeDataCache::clear();
+	LLKeyframeDataCache::clear();
 }
 
 //-----------------------------------------------------------------------------
@@ -2093,7 +2092,6 @@ void LLKeyframeDataCache::removeKeyframeData(const LLUUID& id)
 	keyframe_data_map_t::iterator found_data = sKeyframeDataMap.find(id);
 	if (found_data != sKeyframeDataMap.end())
 	{
-		delete found_data->second;
 		sKeyframeDataMap.erase(found_data);
 	}
 }
@@ -2124,7 +2122,6 @@ LLKeyframeDataCache::~LLKeyframeDataCache()
 //-----------------------------------------------------------------------------
 void LLKeyframeDataCache::clear()
 {
-	for_each(sKeyframeDataMap.begin(), sKeyframeDataMap.end(), DeletePairedPointer());
 	sKeyframeDataMap.clear();
 }
 
diff --git a/indra/llcharacter/llkeyframemotion.h b/indra/llcharacter/llkeyframemotion.h
index 54cf2fefcd..5a03f7549a 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -20,6 +20,7 @@
 #include "llhandmotion.h"
 #include "lljointstate.h"
 #include "llmotion.h"
+#include "llmemory.h"
 #include "llptrskipmap.h"
 #include "llquaternion.h"
 #include "v3dmath.h"
@@ -131,7 +132,7 @@ public:
 	BOOL	serialize(LLDataPacker& dp) const;
 	BOOL	deserialize(LLDataPacker& dp);
 	void	writeCAL3D(apr_file_t* fp);
-	BOOL	isLoaded() { return mJointMotionList != NULL; }
+	BOOL	isLoaded() { return mJointMotionList.notNull(); }
 
 
 	// setters for modifying a keyframe animation
@@ -371,8 +372,11 @@ public:
 	//-------------------------------------------------------------------------
 	// JointMotionList
 	//-------------------------------------------------------------------------
-	class JointMotionList
+	class JointMotionList : public LLRefCount
 	{
+	protected:
+		~JointMotionList();
+
 	public:
 		U32						mNumJointMotions;
 		JointMotion*			mJointMotionArray;
@@ -390,7 +394,6 @@ public:
 		LLBBoxLocal				mPelvisBBox;
 	public:
 		JointMotionList();
-		~JointMotionList();
 		U32 dumpDiagInfo();
 	};
 
@@ -401,7 +404,7 @@ protected:
 	//-------------------------------------------------------------------------
 	// Member Data
 	//-------------------------------------------------------------------------
-	JointMotionList*				mJointMotionList;
+	LLPointer<JointMotionList>		mJointMotionList;
 	LLJointState*					mJointStates;
 	LLJoint*						mPelvisp;
 	LLCharacter*					mCharacter;
@@ -421,7 +424,7 @@ public:
 	LLKeyframeDataCache(){};
 	~LLKeyframeDataCache();
 
-	typedef std::map<LLUUID, class LLKeyframeMotion::JointMotionList*> keyframe_data_map_t; 
+	typedef std::map<LLUUID, LLPointer<class LLKeyframeMotion::JointMotionList> > keyframe_data_map_t; 
 	static keyframe_data_map_t sKeyframeDataMap;
 
 	static void addKeyframeData(const LLUUID& id, LLKeyframeMotion::JointMotionList*);
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 36c2bdcddb..03bc415af3 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -12,7 +12,7 @@
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
 const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_BUILD = 46464;
 
 const char * const LL_CHANNEL = "Second Life Server";
 
diff --git a/indra/llcommon/llversionviewer.h b/indra/llcommon/llversionviewer.h
index c952ad47f8..7edef268bd 100644
--- a/indra/llcommon/llversionviewer.h
+++ b/indra/llcommon/llversionviewer.h
@@ -11,8 +11,8 @@
 
 const S32 LL_VERSION_MAJOR = 1;
 const S32 LL_VERSION_MINOR = 18;
-const S32 LL_VERSION_PATCH = 3;
-const S32 LL_VERSION_BUILD = 2;
+const S32 LL_VERSION_PATCH = 2;
+const S32 LL_VERSION_BUILD = 46464;
 
 const char * const LL_CHANNEL = "Second Life Release";
 
diff --git a/indra/llwindow/llwindowsdl.cpp b/indra/llwindow/llwindowsdl.cpp
index 86c9e8fdc6..b8c98e1a82 100644
--- a/indra/llwindow/llwindowsdl.cpp
+++ b/indra/llwindow/llwindowsdl.cpp
@@ -2005,10 +2005,10 @@ void LLWindowSDL::gatherInput()
 			SDLReallyCaptureInput(TRUE);
 
                 if (event.key.keysym.unicode)
-		{
-			handleUnicodeUTF16(event.key.keysym.unicode,
-					   gKeyboard->currentMask(FALSE));
-		}
+				{
+					handleUnicodeUTF16(event.key.keysym.unicode,
+									   gKeyboard->currentMask(FALSE));
+				}
                 break;
 
             case SDL_KEYUP:
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(