livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

master
Aaron Brashears 2007-09-13 00:51:23 +00:00
parent 55e52f3631
commit 3d58b54f0e
11 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/llcharacter/llkeyframemotion.cpp
View File

@ -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();
}

13
indra/llcharacter/llkeyframemotion.h
View File

@ -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*);

2
indra/llcommon/llversionserver.h
View File

@ -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";

4
indra/llcommon/llversionviewer.h
View File

@ -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";

8
indra/llwindow/llwindowsdl.cpp
View File

@ -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:

4
indra/newview/English.lproj/InfoPlist.strings
View File

@ -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.";

2
indra/newview/Info-SecondLife.plist
View File

@ -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>

10
indra/newview/llfolderview.cpp
View File

@ -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;
}

1
indra/newview/llinventorybridge.cpp
View File

@ -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");

1
indra/newview/llpanelgroupgeneral.cpp
View File

@ -790,7 +790,6 @@ void LLPanelGroupGeneral::updateMembers()
}
}
void LLPanelGroupGeneral::updateChanged()
{
mChanged = FALSE;

3
indra/newview/llviewermessage.cpp
View File

@ -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(