From fbb4e5fb0f7bba935ec9d0d466be12a346a6b149 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Fri, 8 Jun 2012 13:49:02 -0400
Subject: STORM-68 As a Builder, I want that ability to set default permissions
 on creation of objects, clothing, scripts, notecards, etc. First pass at
 implementation, debuggins lines still need to be removed and there is one
 known bug to be resolved.

---
 indra/newview/llviewerinventory.h | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'indra/newview/llviewerinventory.h')

diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index 7822ef4da6..a88a5d31be 100644
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -279,12 +279,24 @@ public:
 	void fire(const LLUUID& inv_item);
 };
 
+class CreateScriptCallback : public LLInventoryCallback
+{
+public:
+	void fire(const LLUUID& inv_item);
+};
+
 class CreateGestureCallback : public LLInventoryCallback
 {
 public:
 	void fire(const LLUUID& inv_item);
 };
 
+class CreateNotecardCallback : public LLInventoryCallback
+{
+public:
+	void fire(const LLUUID& inv_item);
+};
+
 class AddFavoriteLandmarkCallback : public LLInventoryCallback
 {
 public:
-- 
cgit v1.2.3


From 176901422f0122dad8d1e4e423d0bc19e9e4ad8a Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 20 Nov 2013 10:21:41 -0500
Subject: STORM-68 Reapply changes to inventory processing lost in the merge.
 Move call to updateCap back to where it was.  The place it was moved to was
 too early in the login sequence and was causing a crash.

---
 indra/newview/llviewerinventory.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/llviewerinventory.h')

diff --git a/indra/newview/llviewerinventory.h b/indra/newview/llviewerinventory.h
index ab19a12014..dc2fdb8c8d 100755
--- a/indra/newview/llviewerinventory.h
+++ b/indra/newview/llviewerinventory.h
@@ -249,7 +249,9 @@ void rez_attachment_cb(const LLUUID& inv_item, LLViewerJointAttachment *attachme
 
 void activate_gesture_cb(const LLUUID& inv_item);
 
+void create_script_cb(const LLUUID& inv_item);
 void create_gesture_cb(const LLUUID& inv_item);
+void create_notecard_cb(const LLUUID& inv_item);
 
 class AddFavoriteLandmarkCallback : public LLInventoryCallback
 {
-- 
cgit v1.2.3