diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-11-01 22:02:35 +0000 |
| commit | 7afa8058aae0d5363cc19c7df1e6d2d7ec3bf7ac (patch) | |
| tree | 52f41bda3e57a58e968421212a8a48eead6f653d /indra/llinventory | |
| parent | 833e8d5c2a1dd48fd89b8b438dbe56572697bb76 (diff) | |
svn merge -r 72652:72881 svn+ssh://svn.lindenlab.com/svn/linden/branches/sl-search-11 --> release
QAR-11: pair-reviewed the merge w/ Sam.
Diffstat (limited to 'indra/llinventory')
| -rw-r--r-- | indra/llinventory/llparcel.cpp | 2 | ||||
| -rw-r--r-- | indra/llinventory/llparcel.h | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/indra/llinventory/llparcel.cpp b/indra/llinventory/llparcel.cpp index 3a67385030..57d315f265 100644 --- a/indra/llinventory/llparcel.cpp +++ b/indra/llinventory/llparcel.cpp @@ -38,6 +38,8 @@ #include "llstreamtools.h" #include "llmath.h" +#include "llsd.h" +#include "llsdutil.h" #include "lltransactiontypes.h" #include "lltransactionflags.h" #include "message.h" diff --git a/indra/llinventory/llparcel.h b/indra/llinventory/llparcel.h index 9c6300811b..3af1824645 100644 --- a/indra/llinventory/llparcel.h +++ b/indra/llinventory/llparcel.h @@ -31,6 +31,9 @@ #ifndef LL_LLPARCEL_H #define LL_LLPARCEL_H +#include <time.h> +#include <iostream> + #include "lluuid.h" #include "llparcelflags.h" #include "llpermissions.h" @@ -100,6 +103,7 @@ const U32 RT_LIST = 0x1 << 4; const U32 RT_SELL = 0x1 << 5; class LLMessageSystem; +class LLSD; class LLAccessEntry { @@ -603,8 +607,6 @@ public: std::map<LLUUID,LLAccessEntry> mBanList; std::map<LLUUID,LLAccessEntry> mTempBanList; std::map<LLUUID,LLAccessEntry> mTempAccessList; - - //LLDynamicArray<LLAccessEntry> mRenterList; }; |