summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/contributions.txt1
-rw-r--r--indra/llcharacter/llkeyframemotion.cpp5
-rw-r--r--indra/llcharacter/llkeyframemotion.h13
-rw-r--r--indra/llcommon/llversionviewer.h4
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--indra/newview/Info-SecondLife.plist2
-rw-r--r--indra/newview/llfolderview.cpp10
-rw-r--r--indra/newview/llinventorybridge.cpp3
-rw-r--r--indra/newview/llviewermessage.cpp3
9 files changed, 17 insertions, 28 deletions
diff --git a/doc/contributions.txt b/doc/contributions.txt
index 2f8188f2c4..1ce46e5755 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -147,7 +147,6 @@ Nicholaz Beresford
VWR-1732
VWR-1769
VWR-1808
- VWR-1826
VWR-1861
VWR-1872
VWR-1968
diff --git a/indra/llcharacter/llkeyframemotion.cpp b/indra/llcharacter/llkeyframemotion.cpp
index d8a4acecc1..304de4c6d1 100644
--- a/indra/llcharacter/llkeyframemotion.cpp
+++ b/indra/llcharacter/llkeyframemotion.cpp
@@ -1838,7 +1838,8 @@ void LLKeyframeMotion::setEaseOut(F32 ease_in)
//-----------------------------------------------------------------------------
void LLKeyframeMotion::flushKeyframeCache()
{
- LLKeyframeDataCache::clear();
+ // TODO: Make this safe to do
+// LLKeyframeDataCache::clear();
}
//-----------------------------------------------------------------------------
@@ -2092,6 +2093,7 @@ 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);
}
}
@@ -2122,6 +2124,7 @@ 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 5a03f7549a..54cf2fefcd 100644
--- a/indra/llcharacter/llkeyframemotion.h
+++ b/indra/llcharacter/llkeyframemotion.h
@@ -20,7 +20,6 @@
#include "llhandmotion.h"
#include "lljointstate.h"
#include "llmotion.h"
-#include "llmemory.h"
#include "llptrskipmap.h"
#include "llquaternion.h"
#include "v3dmath.h"
@@ -132,7 +131,7 @@ public:
BOOL serialize(LLDataPacker& dp) const;
BOOL deserialize(LLDataPacker& dp);
void writeCAL3D(apr_file_t* fp);
- BOOL isLoaded() { return mJointMotionList.notNull(); }
+ BOOL isLoaded() { return mJointMotionList != NULL; }
// setters for modifying a keyframe animation
@@ -372,11 +371,8 @@ public:
//-------------------------------------------------------------------------
// JointMotionList
//-------------------------------------------------------------------------
- class JointMotionList : public LLRefCount
+ class JointMotionList
{
- protected:
- ~JointMotionList();
-
public:
U32 mNumJointMotions;
JointMotion* mJointMotionArray;
@@ -394,6 +390,7 @@ public:
LLBBoxLocal mPelvisBBox;
public:
JointMotionList();
+ ~JointMotionList();
U32 dumpDiagInfo();
};
@@ -404,7 +401,7 @@ protected:
//-------------------------------------------------------------------------
// Member Data
//-------------------------------------------------------------------------
- LLPointer<JointMotionList> mJointMotionList;
+ JointMotionList* mJointMotionList;
LLJointState* mJointStates;
LLJoint* mPelvisp;
LLCharacter* mCharacter;
@@ -424,7 +421,7 @@ public:
LLKeyframeDataCache(){};
~LLKeyframeDataCache();
- typedef std::map<LLUUID, LLPointer<class LLKeyframeMotion::JointMotionList> > keyframe_data_map_t;
+ typedef std::map<LLUUID, 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/llversionviewer.h b/indra/llcommon/llversionviewer.h
index 6d5e4610f4..c952ad47f8 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 = 2;
-const S32 LL_VERSION_BUILD = 0;
+const S32 LL_VERSION_PATCH = 3;
+const S32 LL_VERSION_BUILD = 2;
const char * const LL_CHANNEL = "Second Life Release";
diff --git a/indra/newview/English.lproj/InfoPlist.strings b/indra/newview/English.lproj/InfoPlist.strings
index 1b9fdbec5c..e622664aad 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.2.0";
-CFBundleGetInfoString = "Second Life version 1.18.2.0, Copyright 2004-2007 Linden Research, Inc.";
+CFBundleShortVersionString = "Second Life version 1.18.3.2";
+CFBundleGetInfoString = "Second Life version 1.18.3.2, Copyright 2004-2007 Linden Research, Inc.";
diff --git a/indra/newview/Info-SecondLife.plist b/indra/newview/Info-SecondLife.plist
index 87087f7bd9..f4ac5c6a61 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.2.0</string>
+ <string>1.18.3.2</string>
<key>CSResourcesFileMapped</key>
<true/>
</dict>
diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp
index 20f00e297d..f0d6d2d0b1 100644
--- a/indra/newview/llfolderview.cpp
+++ b/indra/newview/llfolderview.cpp
@@ -699,15 +699,7 @@ BOOL LLFolderViewItem::handleHover( S32 x, S32 y, MASK mask )
BOOL LLFolderViewItem::handleDoubleClick( S32 x, S32 y, MASK mask )
{
- 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();
- }
+ preview();
return TRUE;
}
diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp
index 073d6cc088..c6f94841cb 100644
--- a/indra/newview/llinventorybridge.cpp
+++ b/indra/newview/llinventorybridge.cpp
@@ -4229,7 +4229,8 @@ void LLWearableBridge::buildContextMenu(LLMenuGL& menu, U32 flags)
LLViewerInventoryItem* item = getItem();
if( !no_open && item )
{
- no_open = (item->getType() == LLAssetType::AT_CLOTHING);
+ no_open = (item->getType() == LLAssetType::AT_CLOTHING) ||
+ (item->getType() == LLAssetType::AT_BODYPART);
}
if (!no_open)
diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp
index a9eff5d5f5..b27d3d8742 100644
--- a/indra/newview/llviewermessage.cpp
+++ b/indra/newview/llviewermessage.cpp
@@ -73,7 +73,6 @@
#include "llimpanel.h"
#include "llinventorymodel.h"
#include "llinventoryview.h"
-#include "llkeyframemotion.h"
#include "llmenugl.h"
#include "llmutelist.h"
#include "llnetmap.h"
@@ -2695,8 +2694,6 @@ 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(
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 00:49:45 +0000