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/llpreviewnotecard.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/llpreviewnotecard.cpp')
| -rw-r--r-- | indra/newview/llpreviewnotecard.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/llpreviewnotecard.cpp b/indra/newview/llpreviewnotecard.cpp index e5dfb9ae76..8650bcf459 100644 --- a/indra/newview/llpreviewnotecard.cpp +++ b/indra/newview/llpreviewnotecard.cpp @@ -62,7 +62,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, const LLUUID& object_id, const LLUUID& asset_id, BOOL show_keep_discard, - LLViewerInventoryItem* inv_item) : + LLPointer<LLViewerInventoryItem> inv_item) : LLPreview(name, rect, title, item_id, object_id, TRUE, PREVIEW_MIN_WIDTH, PREVIEW_MIN_HEIGHT, @@ -86,7 +86,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, if( mAssetID.isNull() ) { - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); if( item ) { mAssetID = item->getAssetUUID(); @@ -103,7 +103,7 @@ LLPreviewNotecard::LLPreviewNotecard(const std::string& name, childSetVisible("lock", FALSE); - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); childSetCommitCallback("desc", LLPreview::onText, this); if (item) @@ -242,7 +242,7 @@ void LLPreviewNotecard::refreshFromInventory() void LLPreviewNotecard::loadAsset() { // request the asset. - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); LLViewerTextEditor* editor = LLViewerUICtrlFactory::getViewerTextEditorByName(this, "Notecard Editor"); if (!editor) @@ -366,7 +366,7 @@ void LLPreviewNotecard::onLoadComplete(LLVFS *vfs, previewEditor->makePristine(); - LLInventoryItem* item = preview->getItem(); + const LLInventoryItem* item = preview->getItem(); BOOL modifiable = item && gAgent.allowOperation(PERM_MODIFY, item->getPermissions(), GP_OBJECT_MANIPULATE); preview->setEnabled(modifiable); @@ -471,7 +471,7 @@ bool LLPreviewNotecard::saveIfNeeded(LLInventoryItem* copyitem) file.setMaxSize(size); file.write((U8*)buffer.c_str(), size); - LLInventoryItem* item = getItem(); + const LLInventoryItem* item = getItem(); // save it out to database if (item) { |