aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llinventory/llparcel.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:16 -0500
committerJacek Antonelli2008-08-15 23:45:16 -0500
commit3f27ba891ac4d032753b219b4b96d1ffbc9fb488 (patch)
tree504932ee91a0356fba7ea48798887c96867e492f /linden/indra/llinventory/llparcel.h
parentSecond Life viewer sources 1.18.4.3 (diff)
downloadmeta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.zip
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.gz
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.bz2
meta-impy-3f27ba891ac4d032753b219b4b96d1ffbc9fb488.tar.xz
Second Life viewer sources 1.18.5.0-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/llinventory/llparcel.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/llinventory/llparcel.h b/linden/indra/llinventory/llparcel.h
index 9c63008..3af1824 100644
--- a/linden/indra/llinventory/llparcel.h
+++ b/linden/indra/llinventory/llparcel.h
@@ -31,6 +31,9 @@
31#ifndef LL_LLPARCEL_H 31#ifndef LL_LLPARCEL_H
32#define LL_LLPARCEL_H 32#define LL_LLPARCEL_H
33 33
34#include <time.h>
35#include <iostream>
36
34#include "lluuid.h" 37#include "lluuid.h"
35#include "llparcelflags.h" 38#include "llparcelflags.h"
36#include "llpermissions.h" 39#include "llpermissions.h"
@@ -100,6 +103,7 @@ const U32 RT_LIST = 0x1 << 4;
100const U32 RT_SELL = 0x1 << 5; 103const U32 RT_SELL = 0x1 << 5;
101 104
102class LLMessageSystem; 105class LLMessageSystem;
106class LLSD;
103 107
104class LLAccessEntry 108class LLAccessEntry
105{ 109{
@@ -603,8 +607,6 @@ public:
603 std::map<LLUUID,LLAccessEntry> mBanList; 607 std::map<LLUUID,LLAccessEntry> mBanList;
604 std::map<LLUUID,LLAccessEntry> mTempBanList; 608 std::map<LLUUID,LLAccessEntry> mTempBanList;
605 std::map<LLUUID,LLAccessEntry> mTempAccessList; 609 std::map<LLUUID,LLAccessEntry> mTempAccessList;
606
607 //LLDynamicArray<LLAccessEntry> mRenterList;
608}; 610};
609 611
610 612