diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewerregion.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewerregion.h b/linden/indra/newview/llviewerregion.h index 9f59197..b8e19cc 100644 --- a/linden/indra/newview/llviewerregion.h +++ b/linden/indra/newview/llviewerregion.h | |||
@@ -12,12 +12,12 @@ | |||
12 | * ("GPL"), unless you have obtained a separate licensing agreement | 12 | * ("GPL"), unless you have obtained a separate licensing agreement |
13 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 13 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 14 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
15 | * online at http://secondlife.com/developers/opensource/gplv2 | 15 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
16 | * | 16 | * |
17 | * There are special exceptions to the terms and conditions of the GPL as | 17 | * There are special exceptions to the terms and conditions of the GPL as |
18 | * it is applied to this Source Code. View the full text of the exception | 18 | * it is applied to this Source Code. View the full text of the exception |
19 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 19 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
20 | * online at http://secondlife.com/developers/opensource/flossexception | 20 | * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception |
21 | * | 21 | * |
22 | * By copying, modifying or distributing this software, you acknowledge | 22 | * By copying, modifying or distributing this software, you acknowledge |
23 | * that you have read and understood your obligations described above, | 23 | * that you have read and understood your obligations described above, |
@@ -109,6 +109,8 @@ public: | |||
109 | void setWaterHeight(F32 water_level); | 109 | void setWaterHeight(F32 water_level); |
110 | F32 getWaterHeight() const; | 110 | F32 getWaterHeight() const; |
111 | 111 | ||
112 | BOOL isVoiceEnabled() const; | ||
113 | |||
112 | void setBillableFactor(F32 billable_factor) { mBillableFactor = billable_factor; } | 114 | void setBillableFactor(F32 billable_factor) { mBillableFactor = billable_factor; } |
113 | F32 getBillableFactor() const { return mBillableFactor; } | 115 | F32 getBillableFactor() const { return mBillableFactor; } |
114 | 116 | ||