From 1c909afe3998778e4cc045c9ab733e8afbf7c25b Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Wed, 2 May 2007 21:24:47 +0000
Subject: svn merge -r 60342:61148
 svn+ssh://svn/svn/linden/branches/maintenance into release

---
 indra/newview/llresourcedata.h | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 indra/newview/llresourcedata.h

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

diff --git a/indra/newview/llresourcedata.h b/indra/newview/llresourcedata.h
new file mode 100644
index 0000000000..20a8df4c22
--- /dev/null
+++ b/indra/newview/llresourcedata.h
@@ -0,0 +1,24 @@
+/** 
+ * @file llresourcedata.h
+ * @brief Tracking object for uploads.
+ *
+ * Copyright (c) 2006-$CurrentYear$, Linden Research, Inc.
+ * $License$
+ */
+
+#ifndef LLRESOURCEDATA_H
+#define LLRESOURCEDATA_H
+
+#include "llassetstorage.h"
+#include "llinventorytype.h"
+
+struct LLResourceData
+{
+	LLAssetInfo mAssetInfo;
+	LLAssetType::EType mPreferredLocation;
+	LLInventoryType::EType mInventoryType;
+	U32 mNextOwnerPerm;
+	void *mUserData;
+};
+
+#endif
-- 
cgit v1.2.3