diff options
Diffstat (limited to 'linden/indra/newview/llviewergenericmessage.cpp')
-rw-r--r-- | linden/indra/newview/llviewergenericmessage.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/linden/indra/newview/llviewergenericmessage.cpp b/linden/indra/newview/llviewergenericmessage.cpp index 0bbcadd..e4b325d 100644 --- a/linden/indra/newview/llviewergenericmessage.cpp +++ b/linden/indra/newview/llviewergenericmessage.cpp | |||
@@ -1,12 +1,12 @@ | |||
1 | /** | 1 | /** |
2 | * @file llviewergenericmessage.cpp | 2 | * @file llviewergenericmessage.cpp |
3 | * @brief Handle processing of "generic messages" which contain short lists of strings. | 3 | * @brief Handle processing of "generic messages" which contain short lists of strings. |
4 | * @author James Cook | 4 | * @author James Cook |
5 | * | 5 | * |
6 | * $LicenseInfo:firstyear=2007&license=viewergpl$ | 6 | * $LicenseInfo:firstyear=2007&license=viewergpl$ |
7 | * | 7 | * |
8 | * Copyright (c) 2007-2009, Linden Research, Inc. | 8 | * Copyright (c) 2007-2009, Linden Research, Inc. |
9 | * | 9 | * |
10 | * Second Life Viewer Source Code | 10 | * Second Life Viewer Source Code |
11 | * The source code in this file ("Source Code") is provided by Linden Lab | 11 | * The source code in this file ("Source Code") is provided by Linden Lab |
12 | * to you under the terms of the GNU General Public License, version 2.0 | 12 | * to you under the terms of the GNU General Public License, version 2.0 |
@@ -14,17 +14,17 @@ | |||
14 | * ("Other License"), formally executed by you and Linden Lab. Terms of | 14 | * ("Other License"), formally executed by you and Linden Lab. Terms of |
15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or | 15 | * the GPL can be found in doc/GPL-license.txt in this distribution, or |
16 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 | 16 | * online at http://secondlifegrid.net/programs/open_source/licensing/gplv2 |
17 | * | 17 | * |
18 | * There are special exceptions to the terms and conditions of the GPL as | 18 | * There are special exceptions to the terms and conditions of the GPL as |
19 | * it is applied to this Source Code. View the full text of the exception | 19 | * it is applied to this Source Code. View the full text of the exception |
20 | * in the file doc/FLOSS-exception.txt in this software distribution, or | 20 | * in the file doc/FLOSS-exception.txt in this software distribution, or |
21 | * online at | 21 | * online at |
22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception | 22 | * http://secondlifegrid.net/programs/open_source/licensing/flossexception |
23 | * | 23 | * |
24 | * By copying, modifying or distributing this software, you acknowledge | 24 | * By copying, modifying or distributing this software, you acknowledge |
25 | * that you have read and understood your obligations described above, | 25 | * that you have read and understood your obligations described above, |
26 | * and agree to abide by those obligations. | 26 | * and agree to abide by those obligations. |
27 | * | 27 | * |
28 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO | 28 | * ALL LINDEN LAB SOURCE CODE IS PROVIDED "AS IS." LINDEN LAB MAKES NO |
29 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, | 29 | * WARRANTIES, EXPRESS, IMPLIED OR OTHERWISE, REGARDING ITS ACCURACY, |
30 | * COMPLETENESS OR PERFORMANCE. | 30 | * COMPLETENESS OR PERFORMANCE. |
@@ -39,7 +39,7 @@ | |||
39 | #include "message.h" | 39 | #include "message.h" |
40 | #include "llagent.h" | 40 | #include "llagent.h" |
41 | #include "lluuid.h" | 41 | #include "lluuid.h" |
42 | #include "lightshare.h" | 42 | #include "llettherebelight.h" |
43 | 43 | ||
44 | 44 | ||
45 | LLDispatcher gGenericDispatcher; | 45 | LLDispatcher gGenericDispatcher; |
@@ -84,16 +84,16 @@ void process_generic_message(LLMessageSystem* msg, void**) | |||
84 | msg->getUUID("AgentData", "AgentID", agent_id); | 84 | msg->getUUID("AgentData", "AgentID", agent_id); |
85 | std::string method; | 85 | std::string method; |
86 | msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method); | 86 | msg->getStringFast(_PREHASH_MethodData, _PREHASH_Method, method); |
87 | 87 | ||
88 | // TODO: Use a proper dispatcher. | 88 | // TODO: Use a proper dispatcher. |
89 | if(method == "Windlight") | 89 | if(method == "Windlight") |
90 | { | 90 | { |
91 | WindlightMessage::processWindlight(msg, NULL); | 91 | LightShare::processWindlight(msg, NULL); |
92 | return; | 92 | return; |
93 | } | 93 | } |
94 | else if(method == "WindlightReset") | 94 | else if(method == "WindlightReset") |
95 | { | 95 | { |
96 | WindlightMessage::resetRegion(); | 96 | LightShare::resetRegion(); |
97 | return; | 97 | return; |
98 | } | 98 | } |
99 | 99 | ||
@@ -111,7 +111,7 @@ void process_generic_message(LLMessageSystem* msg, void**) | |||
111 | 111 | ||
112 | if(!gGenericDispatcher.dispatch(request, invoice, strings)) | 112 | if(!gGenericDispatcher.dispatch(request, invoice, strings)) |
113 | { | 113 | { |
114 | llwarns << "GenericMessage " << request << " failed to dispatch" | 114 | llwarns << "GenericMessage " << request << " failed to dispatch" |
115 | << llendl; | 115 | << llendl; |
116 | } | 116 | } |
117 | } | 117 | } |