summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.h
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
committerJames Cook <james@lindenlab.com>2010-02-11 10:09:23 -0800
commit9dd7924b19651abf393f7b0dee632904a6b8e52a (patch)
treeb22f8ca3ecdf4ec8e5288102912dccdd7289f51f /indra/newview/llpreview.h
parent301f250c1cd77711c0234d8ed4089453712f834e (diff)
parent39fe664b97b946daf7984b946fede6f04ae731c4 (diff)
Merge
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);