summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerinventory.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-06-04 11:10:15 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-06-04 11:10:15 -0400
commitc26eeb6f7a51759bc4597ab7ae6efc80ee50b1c3 (patch)
treebd816169f34950b119db5979efe0d8e68ce98277 /indra/newview/llviewerinventory.h
parenta77d273e3ab448d84507bfdb763df8335eadea9e (diff)
parent47beb6dc9c4f7c1557536f8116cc98b8bbc24629 (diff)
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/llviewerinventory.h')
-rw-r--r--indra/newview/llviewerinventory.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 8ab7c9710d..d0d3ad693e 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -243,7 +243,13 @@ public:
class WearOnAvatarCallback : public LLInventoryCallback
{
+public:
+ WearOnAvatarCallback(bool do_replace = false) : mReplace(do_replace) {}
+
void fire(const LLUUID& inv_item);
+
+protected:
+ bool mReplace;
};
class ModifiedCOFCallback : public LLInventoryCallback