diff options
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/wlretrievesettings.cpp | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/linden/indra/newview/wlretrievesettings.cpp b/linden/indra/newview/wlretrievesettings.cpp index afa84f2..a8ed2b5 100644 --- a/linden/indra/newview/wlretrievesettings.cpp +++ b/linden/indra/newview/wlretrievesettings.cpp | |||
@@ -1,11 +1,11 @@ | |||
1 | /** | 1 | /** |
2 | * @file wlfloaterwindlightsend.cpp | 2 | * @file wlfloaterwindlightsend.cpp |
3 | * @brief WLFloaterWindLightSend class definition | 3 | * @brief WLFloaterWindLightSend class definition |
4 | * | 4 | * |
5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 5 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
6 | * | 6 | * |
7 | * Copyright (c) 2007-2009, Linden Research, Inc. | 7 | * Copyright (c) 2007-2009, Linden Research, Inc. |
8 | * | 8 | * |
9 | * Second Life Viewer Source Code | 9 | * Second Life Viewer Source Code |
10 | * The source code in this file ("Source Code") is provided by Linden Lab | 10 | * The source code in this file ("Source Code") is provided by Linden Lab |
11 | * to you under the terms of the GNU General Public License, version 2.0 | 11 | * to you under the terms of the GNU General Public License, version 2.0 |
@@ -13,17 +13,17 @@ | |||
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://secondlifegrid.net/programs/open_source/licensing/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 | 20 | * online at |
21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | 21 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception |
22 | * | 22 | * |
23 | * By copying, modifying or distributing this software, you acknowledge | 23 | * By copying, modifying or distributing this software, you acknowledge |
24 | * that you have read and understood your obligations described above, | 24 | * that you have read and understood your obligations described above, |
25 | * and agree to abide by those obligations. | 25 | * and agree to abide by those obligations. |
26 | * | 26 | * |
27 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 27 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 28 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
29 | * COMPLETENESS OR PERFORMANCE. | 29 | * COMPLETENESS OR PERFORMANCE. |
@@ -67,8 +67,7 @@ | |||
67 | #include "hippolimits.h" | 67 | #include "hippolimits.h" |
68 | #include "wlfloaterwindlightsend.h" | 68 | #include "wlfloaterwindlightsend.h" |
69 | #include "llviewerregion.h" | 69 | #include "llviewerregion.h" |
70 | #include "wlsettingsmanager.h" | 70 | #include "llettherebelight.h" |
71 | #include "lightshare.h" | ||
72 | 71 | ||
73 | #include "linden_common.h" | 72 | #include "linden_common.h" |
74 | #include "llviewercontrol.h" | 73 | #include "llviewercontrol.h" |
@@ -93,7 +92,7 @@ void retrieveWindlightSettings::result(const LLSD& content) | |||
93 | for(LLSD::array_const_iterator wls = content["WindLight"].beginArray(); | 92 | for(LLSD::array_const_iterator wls = content["WindLight"].beginArray(); |
94 | wls != content["WindLight"].endArray(); | 93 | wls != content["WindLight"].endArray(); |
95 | ++wls) | 94 | ++wls) |
96 | { | 95 | { |
97 | LLSD windLightLLSD = *wls; | 96 | LLSD windLightLLSD = *wls; |
98 | LLWaterParamSet* mWater; | 97 | LLWaterParamSet* mWater; |
99 | LLWLParamSet* mSky; | 98 | LLWLParamSet* mSky; |
@@ -235,4 +234,4 @@ void retrieveWindlightSettings::error(U32 status, const std::string& reason) | |||
235 | { | 234 | { |
236 | LL_INFOS("Inventory") << "retrieveWindlightSettings::error " | 235 | LL_INFOS("Inventory") << "retrieveWindlightSettings::error " |
237 | << status << ": " << reason << LL_ENDL; | 236 | << status << ": " << reason << LL_ENDL; |
238 | } \ No newline at end of file | 237 | } |