summaryrefslogtreecommitdiff
path: root/indra/newview/llsidepaneliteminfo.h
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2010-11-05 16:45:18 -0700
committerbrad kittenbrink <brad@lindenlab.com>2010-11-05 16:45:18 -0700
commitd1c365e7b79c91a51b847535d8df0d804af5ae70 (patch)
tree786ada896c585004d9e94c2171f13fd808009441 /indra/newview/llsidepaneliteminfo.h
parent169fe36f69e3be6104af980ed005af5b77909e90 (diff)
parent124a59263184391b0b4ec418c532b7a715e9b5a3 (diff)
Merge latest lindenlab/viewer-development with mani_linden/viewer-development.
Diffstat (limited to 'indra/newview/llsidepaneliteminfo.h')
-rw-r--r--indra/newview/llsidepaneliteminfo.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llsidepaneliteminfo.h b/indra/newview/llsidepaneliteminfo.h
index 10e93dd7de..6416e2cfe4 100644
--- a/indra/newview/llsidepaneliteminfo.h
+++ b/indra/newview/llsidepaneliteminfo.h
@@ -54,6 +54,8 @@ public:
void setItemID(const LLUUID& item_id);
void setEditMode(BOOL edit);
+ const LLUUID& getObjectID() const;
+
protected:
/*virtual*/ void refresh();
/*virtual*/ void save();