diff options
| author | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
|---|---|---|
| committer | Dave Simmons <simon@lindenlab.com> | 2009-03-20 20:00:47 +0000 |
| commit | 24b26d71ee01211aa796b8061b66ec06a133e4ce (patch) | |
| tree | 96bffcd019c933ad3ebbfd5f096968108b22aab5 /indra/llcommon | |
| parent | 5dfd435872e36445dcc82f99443dfc5a7ee0805a (diff) | |
svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26
Merge latest 1.26 into trunk
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 5 | ||||
| -rw-r--r-- | indra/llcommon/lldate.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llqueuedthread.cpp | 3 | ||||
| -rw-r--r-- | indra/llcommon/llstring.h | 3 |
4 files changed, 8 insertions, 5 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index 4109eade19..ae7863d100 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -244,12 +244,11 @@ const F32 DEFAULT_WATER_HEIGHT = 20.0f; // Maturity ratings for simulators const U8 SIM_ACCESS_MIN = 0; // Treated as 'unknown', usually ends up being SIM_ACCESS_PG -const U8 SIM_ACCESS_TRIAL = 7; const U8 SIM_ACCESS_PG = 13; const U8 SIM_ACCESS_MATURE = 21; const U8 SIM_ACCESS_ADULT = 42; // Seriously Adult Only const U8 SIM_ACCESS_DOWN = 254; -const U8 SIM_ACCESS_MAX = SIM_ACCESS_MATURE; +const U8 SIM_ACCESS_MAX = SIM_ACCESS_ADULT; // group constants const S32 MAX_AGENT_GROUPS = 25; @@ -360,6 +359,8 @@ const U32 MAP_ITEM_POPULAR = 0x04; const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06; const U32 MAP_ITEM_LAND_FOR_SALE = 0x07; const U32 MAP_ITEM_CLASSIFIED = 0x08; +const U32 MAP_ITEM_ADULT_EVENT = 0x09; +const U32 MAP_ITEM_LAND_FOR_SALE_ADULT = 0x0a; // Crash reporter behavior const char* const CRASH_SETTINGS_FILE = "settings_crash_behavior.xml"; diff --git a/indra/llcommon/lldate.h b/indra/llcommon/lldate.h index 36c14a7c7c..32825b18dc 100644 --- a/indra/llcommon/lldate.h +++ b/indra/llcommon/lldate.h @@ -55,7 +55,7 @@ public: LLDate(); /** - * @brief Construct a date equal the source date. + * @brief Construct a date equal to the source date. */ LLDate(const LLDate& date); diff --git a/indra/llcommon/llqueuedthread.cpp b/indra/llcommon/llqueuedthread.cpp index 7e0fb27d60..cd53e701d2 100644 --- a/indra/llcommon/llqueuedthread.cpp +++ b/indra/llcommon/llqueuedthread.cpp @@ -197,8 +197,9 @@ LLQueuedThread::handle_t LLQueuedThread::generateHandle() { mNextHandle++; } + const LLQueuedThread::handle_t res = mNextHandle++; unlockData(); - return mNextHandle++; + return res; } // MAIN thread diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 8915890e18..99a9b9e269 100644 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -40,9 +40,10 @@ #include <wchar.h> #endif +#include <string.h> + #if LL_SOLARIS // stricmp and strnicmp do not exist on Solaris: -#include <string.h> #define stricmp strcasecmp #define strnicmp strncasecmp #endif |