diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2009-04-21 20:08:05 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2009-04-21 20:08:05 +0000 |
| commit | d5aad9ebc33059b34d42595d03fa4cba6b16ca9b (patch) | |
| tree | c8e32181fc9c9d26d50684695d8c101bcc5162e1 /indra/llcommon | |
| parent | 9b2d9c6e6e43f5600be64c65e42c373a199a3e1d (diff) | |
svn merge -r117696:117697 svn+ssh://svn.lindenlab.com/svn/linden/branches/fix-lslrpc/fix-lslrpc-merge to svn+ssh://svn.lindenlab.com/svn/linden/trunk
Diffstat (limited to 'indra/llcommon')
| -rw-r--r-- | indra/llcommon/indra_constants.h | 2 | ||||
| -rw-r--r-- | indra/llcommon/llsdserialize.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/indra/llcommon/indra_constants.h b/indra/llcommon/indra_constants.h index e6ebdfd8cf..c0b0d72d9b 100644 --- a/indra/llcommon/indra_constants.h +++ b/indra/llcommon/indra_constants.h @@ -354,7 +354,7 @@ const U32 PARCEL_MEDIA_COMMAND_LOOP_SET = 13; const U32 MAP_ITEM_TELEHUB = 0x01; const U32 MAP_ITEM_PG_EVENT = 0x02; const U32 MAP_ITEM_MATURE_EVENT = 0x03; -const U32 MAP_ITEM_POPULAR = 0x04; +//const U32 MAP_ITEM_POPULAR = 0x04; // No longer supported, 2009-03-02 KLW //const U32 MAP_ITEM_AGENT_COUNT = 0x05; const U32 MAP_ITEM_AGENT_LOCATIONS = 0x06; const U32 MAP_ITEM_LAND_FOR_SALE = 0x07; diff --git a/indra/llcommon/llsdserialize.h b/indra/llcommon/llsdserialize.h index f7cd91bb77..bb38b75d8f 100644 --- a/indra/llcommon/llsdserialize.h +++ b/indra/llcommon/llsdserialize.h @@ -753,6 +753,9 @@ public: LLPointer<LLSDXMLParser> p = new LLSDXMLParser; return p->parse(str, sd, LLSDSerialize::SIZE_UNLIMITED); } + // Line oriented parser, 30% faster than fromXML(), but can + // only be used when you know you have the complete XML + // document available in the stream. static S32 fromXMLDocument(LLSD& sd, std::istream& str) { LLPointer<LLSDXMLParser> p = new LLSDXMLParser(); |