diff options
| author | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
|---|---|---|
| committer | Sam Kolb <skolb@lindenlab.com> | 2007-08-30 22:11:52 +0000 |
| commit | b2595c369f78b6613e329274f5ca7c43c4ddeda0 (patch) | |
| tree | 4db6ae8237692b570b6e5dad489f3da24c5aa3fe /indra/newview/llselectmgr.h | |
| parent | 84ea29c69c320573c7547f028b5325382e195cc6 (diff) | |
Merge sl-search-opt-in back into the release branch
Reviewed by Josh and Don
Diffstat (limited to 'indra/newview/llselectmgr.h')
| -rw-r--r-- | indra/newview/llselectmgr.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 4986843798..1dc9bce4d5 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -334,6 +334,7 @@ public: BOOL selectionGetFullbright(U8 *fullbright);// true if all selected tes have same bool selectionGetMediaType(U8 *media_type); // true if all selected tes have same BOOL selectionGetClickAction(U8* action); + bool selectionGetIncludeInSearch(bool* include_in_search_out); // true if all selected objects have same void selectionSetMaterial(U8 material); void selectionSetImage(const LLUUID& imageid); // could be item or asset id @@ -348,6 +349,7 @@ public: void selectionSetFullbright( U8 fullbright ); void selectionSetMediaTypeAndURL( U8 media_type, const std::string& media_url ); void selectionSetClickAction(U8 action); + void selectionSetIncludeInSearch(bool include_in_search); void selectionSetObjectPermissions(U8 perm_field, BOOL set, U32 perm_mask, BOOL override = FALSE); void selectionSetObjectName(const LLString& name); @@ -498,6 +500,7 @@ private: static void packObjectIDAndRotation( LLSelectNode* node, void *); static void packObjectLocalID(LLSelectNode* node, void *); static void packObjectClickAction(LLSelectNode* node, void* data); + static void packObjectIncludeInSearch(LLSelectNode* node, void* data); static void packObjectName(LLSelectNode* node, void* user_data); static void packObjectDescription(LLSelectNode* node, void* user_data); static void packObjectCategory(LLSelectNode* node, void* user_data); |