diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-11 18:24:15 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-11 18:24:15 +0000 |
| commit | 28435a08988022f5dd1d0e931b6ad048b8950e11 (patch) | |
| tree | d83112da5b9a3c0b9bf175e03c11aeda1d461382 /indra/newview/llpreviewanim.cpp | |
| parent | 309b56280bff46f1696aee73cbd25f2e61232bc7 (diff) | |
NOTE: Partial merges of the maintenance branch up. The bulk of maintenance 62831:63347 is awaiting final QA and merging, post 1.17.0
svn merge -r 63182:63183 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63341:63342 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
svn merge -r 63420:63421 svn+ssh://svn.lindenlab.com/svn/linden/branches/maintenance --> release
Rush in the following fixes:
* SL-27250 "Stop All Animations" doesn't work when stuck in a pose after teleporting
* SL-44718 VWR-1040: crash when opening several gestures quickly
* SL-44326 recurring error message in agni nightly #1
Diffstat (limited to 'indra/newview/llpreviewanim.cpp')
| -rw-r--r-- | indra/newview/llpreviewanim.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 99cff4b718..6e3403932d 100644 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -31,7 +31,7 @@ LLPreviewAnim::LLPreviewAnim(const std::string& name, const LLRect& rect, const childSetAction("Anim play btn",playAnim,this); childSetAction("Anim audition btn",auditionAnim,this); - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); childSetCommitCallback("desc", LLPreview::onText, this); childSetText("desc", item->getDescription()); @@ -87,7 +87,7 @@ void LLPreviewAnim::endAnimCallback( void *userdata ) void LLPreviewAnim::playAnim( void *userdata ) { LLPreviewAnim* self = (LLPreviewAnim*) userdata; - LLInventoryItem *item = self->getItem(); + const LLInventoryItem *item = self->getItem(); if(item) { @@ -124,7 +124,7 @@ void LLPreviewAnim::playAnim( void *userdata ) void LLPreviewAnim::auditionAnim( void *userdata ) { LLPreviewAnim* self = (LLPreviewAnim*) userdata; - LLInventoryItem *item = self->getItem(); + const LLInventoryItem *item = self->getItem(); if(item) { @@ -160,7 +160,7 @@ void LLPreviewAnim::auditionAnim( void *userdata ) void LLPreviewAnim::saveAnim( void *userdata ) { LLPreviewAnim* self = (LLPreviewAnim*) userdata; - LLInventoryItem *item = self->getItem(); + const LLInventoryItem *item = self->getItem(); if(item) { @@ -186,7 +186,7 @@ void LLPreviewAnim::saveAnim( void *userdata ) void LLPreviewAnim::onClose(bool app_quitting) { - LLInventoryItem *item = getItem(); + const LLInventoryItem *item = getItem(); if(item) { |