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/llpreview.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/llpreview.cpp')
| -rw-r--r-- | indra/newview/llpreview.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 562e4c37c1..c4f958420b 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -50,7 +50,7 @@ LLPreview::LLPreview(const std::string& name) : mAutoFocus = FALSE; } -LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height, LLViewerInventoryItem* inv_item ) +LLPreview::LLPreview(const std::string& name, const LLRect& rect, const std::string& title, const LLUUID& item_uuid, const LLUUID& object_uuid, BOOL allow_resize, S32 min_width, S32 min_height, LLPointer<LLViewerInventoryItem> inv_item ) : LLFloater(name, rect, title, allow_resize, min_width, min_height ), mItemUUID(item_uuid), mSourceID(LLUUID::null), @@ -135,11 +135,11 @@ void LLPreview::setSourceID(const LLUUID& source_id) sPreviewsBySource.insert(preview_multimap_t::value_type(mSourceID, mViewHandle)); } -LLViewerInventoryItem* LLPreview::getItem() const +const LLViewerInventoryItem *LLPreview::getItem() const { - if(mItem != NULL) + if(mItem) return mItem; - LLViewerInventoryItem* item = NULL; + const LLViewerInventoryItem *item = NULL; if(mObjectUUID.isNull()) { // it's an inventory item, so get the item. @@ -160,7 +160,7 @@ LLViewerInventoryItem* LLPreview::getItem() const // Sub-classes should override this function if they allow editing void LLPreview::onCommit() { - LLViewerInventoryItem* item = getItem(); + const LLViewerInventoryItem *item = getItem(); if(item) { if (!item->isComplete()) @@ -333,7 +333,7 @@ BOOL LLPreview::handleHover(S32 x, S32 y, MASK mask) { S32 screen_x; S32 screen_y; - LLViewerInventoryItem *item = getItem(); + const LLViewerInventoryItem *item = getItem(); localPointToScreen(x, y, &screen_x, &screen_y ); if(item @@ -419,7 +419,7 @@ void LLPreview::onDiscardBtn(void* data) { LLPreview* self = (LLPreview*)data; - LLViewerInventoryItem* item = self->getItem(); + const LLViewerInventoryItem* item = self->getItem(); if (!item) return; self->mForceClose = TRUE; |