aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewerobject.h
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewerobject.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/linden/indra/newview/llviewerobject.h b/linden/indra/newview/llviewerobject.h
index 09b1d57..9ce417d 100644
--- a/linden/indra/newview/llviewerobject.h
+++ b/linden/indra/newview/llviewerobject.h
@@ -2,6 +2,8 @@
2 * @file llviewerobject.h 2 * @file llviewerobject.h
3 * @brief Description of LLViewerObject class, which is the base class for most objects in the viewer. 3 * @brief Description of LLViewerObject class, which is the base class for most objects in the viewer.
4 * 4 *
5 * $LicenseInfo:firstyear=2001&license=viewergpl$
6 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 7 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 8 *
7 * Second Life Viewer Source Code 9 * Second Life Viewer Source Code
@@ -24,6 +26,7 @@
24 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO 26 * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO
25 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, 27 * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY,
26 * COMPLETENESS OR PERFORMANCE. 28 * COMPLETENESS OR PERFORMANCE.
29 * $/LicenseInfo$
27 */ 30 */
28 31
29#ifndef LL_LLVIEWEROBJECT_H 32#ifndef LL_LLVIEWEROBJECT_H
@@ -427,6 +430,9 @@ public:
427 inline BOOL flagCameraSource() const { return ((mFlags & FLAGS_CAMERA_SOURCE) != 0); } 430 inline BOOL flagCameraSource() const { return ((mFlags & FLAGS_CAMERA_SOURCE) != 0); }
428 inline BOOL flagCameraDecoupled() const { return ((mFlags & FLAGS_CAMERA_DECOUPLED) != 0); } 431 inline BOOL flagCameraDecoupled() const { return ((mFlags & FLAGS_CAMERA_DECOUPLED) != 0); }
429 432
433 bool getIncludeInSearch() const;
434 void setIncludeInSearch(bool include_in_search);
435
430 // Does "open" object menu item apply? 436 // Does "open" object menu item apply?
431 BOOL allowOpen() const; 437 BOOL allowOpen() const;
432 438
@@ -534,6 +540,9 @@ protected:
534 540
535 BOOL setData(const U8 *datap, const U32 data_size); 541 BOOL setData(const U8 *datap, const U32 data_size);
536 542
543 // Hide or show HUD, icon and particles
544 void hideExtraDisplayItems( BOOL hidden );
545
537 ////////////////////////// 546 //////////////////////////
538 // 547 //
539 // inventory functionality 548 // inventory functionality