summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.h
diff options
context:
space:
mode:
authorYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-04 15:45:24 +0200
committerYchebotarev ProductEngine <ychebotarev@productengine.com>2010-02-04 15:45:24 +0200
commit0ae5368cc61f8ce95a186e6c2268b1e0a8d59c14 (patch)
tree2beb159778842156fad344e55ce8e00de397b6d2 /indra/newview/llpreview.h
parent36a44ba0e9133e78cc66f7d0b65d0890cfeb3db5 (diff)
parent56ca1aebb866b7d7e1526e31797dd7e07fcb74a8 (diff)
merge
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llpreview.h')
-rw-r--r--indra/newview/llpreview.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index 3b9f7f9882..551e247d8c 100644
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -74,7 +74,7 @@ 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);