svn merge -r113004:115000 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.26

Merge latest 1.26 into trunk

1 files changed, 32 insertions, 0 deletions

diff --git a/indra/llmessage/llqueryflags.h b/indra/llmessage/llqueryflags.h
index d0496cc077..960d7777a7 100644
--- a/indra/llmessage/llqueryflags.h
+++ b/indra/llmessage/llqueryflags.h
@@ -65,6 +65,13 @@ const U32 DFQ_LIMIT_BY_AREA		= 0x1 << 21;
 const U32 DFQ_FILTER_MATURE		= 0x1 << 22;
 const U32 DFQ_PG_PARCELS_ONLY	= 0x1 << 23;
 
+const U32 DFQ_INC_PG		 	= 0x1 << 24;	// Flags appear in 1.23 viewer or later
+const U32 DFQ_INC_MATURE     	= 0x1 << 25;
+const U32 DFQ_INC_ADULT     	= 0x1 << 26;
+const U32 DFQ_INC_NEW_VIEWER	= (DFQ_INC_PG | DFQ_INC_MATURE | DFQ_INC_ADULT);	// Indicates 1.23 viewer or later
+
+const U32 DFQ_ADULT_SIMS_ONLY	= 0x1 << 27;
+
 // Sell Type flags
 const U32 ST_AUCTION	= 0x1 << 1;
 const U32 ST_NEWBIE		= 0x1 << 2;
@@ -73,4 +80,29 @@ const U32 ST_ESTATE		= 0x1 << 4;
 
 const U32 ST_ALL		= 0xFFFFFFFF;
 
+// status flags embedded in search replay messages of classifieds, events, groups, and places.
+// Places
+const U32 STATUS_SEARCH_PLACES_NONE				= 0x0;
+const U32 STATUS_SEARCH_PLACES_BANNEDWORD		= 0x1 << 0;
+const U32 STATUS_SEARCH_PLACES_SHORTSTRING		= 0x1 << 1;
+const U32 STATUS_SEARCH_PLACES_FOUNDNONE		= 0x1 << 2;
+const U32 STATUS_SEARCH_PLACES_SEARCHDISABLED	= 0x1 << 3;
+const U32 STATUS_SEARCH_PLACES_ESTATEEMPTY		= 0x1 << 4;
+// Events
+const U32 STATUS_SEARCH_EVENTS_NONE				= 0x0;
+const U32 STATUS_SEARCH_EVENTS_BANNEDWORD		= 0x1 << 0;
+const U32 STATUS_SEARCH_EVENTS_SHORTSTRING		= 0x1 << 1;
+const U32 STATUS_SEARCH_EVENTS_FOUNDNONE		= 0x1 << 2;
+const U32 STATUS_SEARCH_EVENTS_SEARCHDISABLED	= 0x1 << 3;
+const U32 STATUS_SEARCH_EVENTS_NODATEOFFSET		= 0x1 << 4;
+const U32 STATUS_SEARCH_EVENTS_NOCATEGORY		= 0x1 << 5;
+const U32 STATUS_SEARCH_EVENTS_NOQUERY		= 0x1 << 6;
+
+//Classifieds
+const U32 STATUS_SEARCH_CLASSIFIEDS_NONE			= 0x0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_BANNEDWORD		= 0x1 << 0;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SHORTSTRING		= 0x1 << 1;
+const U32 STATUS_SEARCH_CLASSIFIEDS_FOUNDNONE		= 0x1 << 2;
+const U32 STATUS_SEARCH_CLASSIFIEDS_SEARCHDISABLED	= 0x1 << 3;
+
 #endif