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/llpreviewscript.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'indra/newview/llpreviewscript.cpp') diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 51ead9c532..07e3853b27 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1077,7 +1077,7 @@ LLPreviewLSL::LLPreviewLSL(const std::string& name, const LLRect& rect, moveResizeHandleToFront(); - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); childSetCommitCallback("desc", LLPreview::onText, this); childSetText("desc", item->getDescription()); @@ -1131,7 +1131,7 @@ void LLPreviewLSL::loadAsset() // *HACK: we poke into inventory to see if it's there, and if so, // then it might be part of the inventory library. If it's in the // library, then you can see the script, but not modify it. - LLInventoryItem* item = gInventory.getItem(mItemUUID); + const LLInventoryItem* item = gInventory.getItem(mItemUUID); BOOL is_library = item && !gInventory.isObjectDescendentOf(mItemUUID, gAgent.getInventoryRootID()); @@ -1258,7 +1258,7 @@ void LLPreviewLSL::saveIfNeeded() fclose(fp); fp = NULL; - LLInventoryItem *inv_item = getItem(); + const LLInventoryItem *inv_item = getItem(); // save it out to asset server std::string url = gAgent.getRegion()->getCapability("UpdateScriptAgentInventory"); if(inv_item) @@ -1373,8 +1373,8 @@ void LLPreviewLSL::onSaveComplete(const LLUUID& asset_uuid, void* user_data, S32 { if (info) { - LLViewerInventoryItem* item; - item = (LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID); + const LLViewerInventoryItem* item; + item = (const LLViewerInventoryItem*)gInventory.getItem(info->mItemUUID); if(item) { LLPointer new_item = new LLViewerInventoryItem(item); -- cgit v1.2.3