summaryrefslogtreecommitdiff
path: root/indra/newview/llpreview.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2015-09-04 13:15:48 -0400
committerOz Linden <oz@lindenlab.com>2015-09-04 13:15:48 -0400
commitaafc82668073e26e8c8a951a96bff9b1d1993262 (patch)
tree1972c12ee782ff3635c07ee89f09f0215f55a969 /indra/newview/llpreview.h
parentc9af158e36eae83f6e3eba97762369affa84848b (diff)
parent1be63209331d509396bd7ee79302d511fe83d72e (diff)
merge changes for 3.8.3-release
Diffstat (limited to 'indra/newview/llpreview.h')
-rwxr-xr-xindra/newview/llpreview.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/newview/llpreview.h b/indra/newview/llpreview.h
index 759430c3a5..49c114720b 100755
--- a/indra/newview/llpreview.h
+++ b/indra/newview/llpreview.h
@@ -105,7 +105,11 @@ public:
// llview
/*virtual*/ void draw();
void refreshFromItem();
-
+
+ // We can't modify Item or description in preview if either in-world Object
+ // or Item itself is unmodifiable
+ static BOOL canModify(const LLUUID taskUUID, const LLInventoryItem* item);
+
protected:
virtual void onCommit();