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

merge

meow-7.2.2
Richard Nelson 2010-06-14 15:39:00 -07:00
parent e97cef4de9 baf9b3cb07
commit 7df20f1315
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/llcommon/llthread.h
View File

@ -135,7 +135,7 @@ class LL_COMMON_API LLMutex
{
public:
LLMutex(apr_pool_t *apr_poolp); // NULL pool constructs a new pool for the mutex
~LLMutex();
virtual ~LLMutex();
void lock(); // blocks
void unlock();

1
indra/llimage/llimagepng.cpp
View File

@ -135,6 +135,7 @@ BOOL LLImagePNG::encode(const LLImageRaw* raw_image, F32 encode_time)
if (! pngWrapper.writePng(raw_image, mTmpWriteBuffer))
{
setLastError(pngWrapper.getErrorMessage());
delete[] mTmpWriteBuffer;
return FALSE;
}

1
indra/llmessage/llhttpclient.cpp
View File

@ -199,6 +199,7 @@ namespace
fileBuffer = new U8 [fileSize];
vfile.read(fileBuffer, fileSize);
ostream.write((char*)fileBuffer, fileSize);
delete [] fileBuffer;
eos = true;
return STATUS_DONE;
}

18
indra/newview/llagentcamera.cpp
View File

@ -2312,12 +2312,6 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came
startCameraAnimation();
}
// Remove any pitch from the avatar
//LLVector3 at = gAgent.getFrameAgent().getAtAxis();
//at.mV[VZ] = 0.f;
//at.normalize();
//gAgent.resetAxes(at);
if (mCameraMode != CAMERA_MODE_CUSTOMIZE_AVATAR)
{
updateLastCamera();
@ -2338,9 +2332,11 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came
if (isAgentAvatarValid())
{
if(avatar_animate)
{
// Remove any pitch from the avatar
LLVector3 at = gAgent.getFrameAgent().getAtAxis();
{
// slamming the avatar's axis to the camera so that when the rotation
// completes it correctly points to the front of the avatar
// Remove any pitch or rotation from the avatar
LLVector3 at = LLViewerCamera::getInstance()->getAtAxis();
at.mV[VZ] = 0.f;
at.normalize();
gAgent.resetAxes(at);
@ -2360,6 +2356,10 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came
mAnimationDuration = gSavedSettings.getF32("ZoomTime");
}
}
// this is what sets the avatar as the mFocusTargetGlobal
setFocusGlobal(LLVector3d::zero);
gAgentAvatarp->updateMeshTextures();
}
else

4
indra/newview/llsidepanelappearance.cpp
View File

@ -352,12 +352,12 @@ void LLSidepanelAppearance::toggleWearableEditPanel(BOOL visible, LLWearable *we
if (visible)
{
mEditWearable->setWearable(wearable);
mEditWearable->onOpen(LLSD()); // currently no-op, just for consistency
if (!disable_camera_switch && gSavedSettings.getBOOL("AppearanceCameraMovement") )
{
gAgentCamera.changeCameraToCustomizeAvatar();
}
mEditWearable->setWearable(wearable);
mEditWearable->onOpen(LLSD()); // currently no-op, just for consistency
}
else
{