diff options
Diffstat (limited to 'indra/newview/llpreview.h')
| -rw-r--r-- | indra/newview/llpreview.h | 65 |
1 files changed, 29 insertions, 36 deletions
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h index f6042f065b..896e17c3c3 100644 --- a/indra/newview/llpreview.h +++ b/indra/newview/llpreview.h @@ -2,31 +2,25 @@ * @file llpreview.h * @brief LLPreview class definition * - * $LicenseInfo:firstyear=2002&license=viewergpl$ - * - * Copyright (c) 2002-2009, Linden Research, Inc. - * + * $LicenseInfo:firstyear=2002&license=viewerlgpl$ * Second Life Viewer Source Code - * The source code in this file ("Source Code") is provided by Linden Lab - * to you under the terms of the GNU General Public License, version 2.0 - * ("GPL"), unless you have obtained a separate licensing agreement - * ("Other License"), formally executed by you and Linden Lab. Terms of - * the GPL can be found in doc/GPL-license.txt in this distribution, or - * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 + * Copyright (C) 2010, Linden Research, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; + * version 2.1 of the License only. * - * There are special exceptions to the terms and conditions of the GPL as - * it is applied to this Source Code. View the full text of the exception - * in the file doc/FLOSS-exception.txt in this software distribution, or - * online at - * http://secondlifegrid.net/programs/open_source/licensing/flossexception + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * - * By copying, modifying or distributing this software, you acknowledge - * that you have read and understood your obligations described above, - * and agree to abide by those obligations. + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * - * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO - * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, - * COMPLETENESS OR PERFORMANCE. + * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA * $/LicenseInfo$ */ @@ -35,13 +29,12 @@ #include "llmultifloater.h" #include "llresizehandle.h" -#include "llmap.h" +#include "llpointer.h" #include "lluuid.h" -#include "llviewerinventory.h" -#include "lltabcontainer.h" -#include "llinventorymodel.h" +#include "llinventoryobserver.h" #include <map> +class LLInventoryItem; class LLLineEditor; class LLRadioGroup; class LLPreview; @@ -75,9 +68,10 @@ public: /*virtual*/ BOOL postBuild(); - void setObjectID(const LLUUID& object_id); + virtual void setObjectID(const LLUUID& object_id); void setItem( LLInventoryItem* item ); + void setAssetId(const LLUUID& asset_id); const LLInventoryItem* getItem() const; // searches if not constructed with it static void hide(const LLUUID& item_uuid, BOOL no_saving = FALSE ); @@ -88,11 +82,7 @@ public: virtual BOOL handleHover(S32 x, S32 y, MASK mask); virtual void onOpen(const LLSD& key); - void setAuxItem( const LLInventoryItem* item ) - { - if ( mAuxItem ) - mAuxItem->copyItem(item); - } + void setAuxItem( const LLInventoryItem* item ); static void onBtnCopyToInv(void* userdata); @@ -107,11 +97,12 @@ public: virtual EAssetStatus getAssetStatus() { return mAssetStatus;} static LLPreview* getFirstPreviewForSource(const LLUUID& source_id); - void setNotecardInfo(const LLUUID& notecard_inv_id, const LLUUID& object_id) - { mNotecardInventoryID = notecard_inv_id; mObjectID = object_id; } + + // Why is this at the LLPreview level? JC + void setNotecardInfo(const LLUUID& notecard_inv_id, const LLUUID& object_id); // llview - virtual void draw(); + /*virtual*/ void draw(); void refreshFromItem(); protected: @@ -129,7 +120,7 @@ protected: protected: LLUUID mItemUUID; - // mObjectID will have a value if it is associated with a task in + // mObjectUUID will have a value if it is associated with a task in // the world, and will be == LLUUID::null if it's in the agent // inventory. LLUUID mObjectUUID; @@ -152,7 +143,9 @@ protected: EAssetStatus mAssetStatus; LLUUID mNotecardInventoryID; - LLUUID mObjectID; + // I am unsure if this is always the same as mObjectUUID, or why it exists + // at the LLPreview level. JC 2009-06-24 + LLUUID mNotecardObjectID; }; |