diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-17 23:02:00 +0000 |
| commit | 71d28bdbf0baab9302c8f458e3bdbcfc60d656d4 (patch) | |
| tree | 19f051897838d5a75e5ce1e776bb52a330173171 /indra/newview/llpreviewscript.cpp | |
| parent | fc664e93e62645fc6e9659664351e77f3c4b374f (diff) | |
merge release@56803 release-candidate@56833
Diffstat (limited to 'indra/newview/llpreviewscript.cpp')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index 175824d866..934b73000b 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -847,7 +847,7 @@ void LLPreviewLSL::loadAsset() // do the more generic search. getItem(); } - if(item && !(item->getAssetUUID().isNull())) + if(item) { BOOL is_copyable = gAgent.allowOperation(PERM_COPY, item->getPermissions(), GP_OBJECT_MANIPULATE); @@ -1153,6 +1153,8 @@ void LLPreviewLSL::onSaveBytecodeComplete(const LLUUID& asset_uuid, void* user_d void LLPreviewLSL::onLoadComplete( LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status) { + lldebugs << "LLPreviewLSL::onLoadComplete: got uuid " << asset_uuid + << llendl; LLUUID* item_uuid = (LLUUID*)user_data; LLPreviewLSL* preview = LLPreviewLSL::getInstance(*item_uuid); if( preview ) @@ -1357,7 +1359,7 @@ void LLLiveLSLEditor::loadAsset(BOOL is_new) mScriptEd->mEditor->makePristine(); mScriptEd->mEditor->setEnabled(FALSE); } - else if(mItem.notNull() && mItem->getAssetUUID().notNull()) + else if(mItem.notNull()) { // request the text from the object LLUUID* user_data = new LLUUID(mItemID ^ mObjectID); @@ -1435,6 +1437,8 @@ void LLLiveLSLEditor::onLoadComplete(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType type, void* user_data, S32 status) { + lldebugs << "LLLiveLSLEditor::onLoadComplete: got uuid " << asset_id + << llendl; LLLiveLSLEditor* instance = NULL; LLUUID* xored_id = (LLUUID*)user_data; |