From 28435a08988022f5dd1d0e931b6ad048b8950e11 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Mon, 11 Jun 2007 18:24:15 +0000 Subject: 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 --- indra/newview/llpreviewsound.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/newview/llpreviewsound.cpp') diff --git a/indra/newview/llpreviewsound.cpp b/indra/newview/llpreviewsound.cpp index 871a0c55b7..7df0e48762 100644 --- a/indra/newview/llpreviewsound.cpp +++ b/indra/newview/llpreviewsound.cpp @@ -39,7 +39,7 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons button = LLUICtrlFactory::getButtonByName(this, "Sound audition btn"); button->setSoundFlags(LLView::SILENT); - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); childSetCommitCallback("desc", LLPreview::onText, this); childSetText("desc", item->getDescription()); @@ -65,7 +65,7 @@ LLPreviewSound::LLPreviewSound(const std::string& name, const LLRect& rect, cons void LLPreviewSound::playSound( void *userdata ) { LLPreviewSound* self = (LLPreviewSound*) userdata; - LLInventoryItem *item = self->getItem(); + const LLInventoryItem *item = self->getItem(); if(item && gAudiop) { @@ -77,7 +77,7 @@ void LLPreviewSound::playSound( void *userdata ) void LLPreviewSound::auditionSound( void *userdata ) { LLPreviewSound* self = (LLPreviewSound*) userdata; - LLInventoryItem *item = self->getItem(); + const LLInventoryItem *item = self->getItem(); if(item && gAudiop) { -- cgit v1.2.3