aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermessage.h
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llviewermessage.h')
-rw-r--r--linden/indra/newview/llviewermessage.h14
1 files changed, 2 insertions, 12 deletions
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h
index 258003e..ce8f6a7 100644
--- a/linden/indra/newview/llviewermessage.h
+++ b/linden/indra/newview/llviewermessage.h
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 5 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -28,12 +29,10 @@
28#ifndef LL_LLVIEWERMESSAGE_H 29#ifndef LL_LLVIEWERMESSAGE_H
29#define LL_LLVIEWERMESSAGE_H 30#define LL_LLVIEWERMESSAGE_H
30 31
31//#include "linked_lists.h"
32#include "llinstantmessage.h" 32#include "llinstantmessage.h"
33#include "lltransactiontypes.h" 33#include "lltransactiontypes.h"
34#include "lluuid.h" 34#include "lluuid.h"
35#include "stdenums.h" 35#include "stdenums.h"
36#include "message.h"
37 36
38// 37//
39// Forward declarations 38// Forward declarations
@@ -42,6 +41,7 @@ class LLColor4;
42class LLViewerObject; 41class LLViewerObject;
43class LLInventoryObject; 42class LLInventoryObject;
44class LLInventoryItem; 43class LLInventoryItem;
44class LLMessageSystem;
45class LLViewerRegion; 45class LLViewerRegion;
46 46
47// 47//
@@ -188,8 +188,6 @@ void process_decline_callingcard(LLMessageSystem* msg, void**);
188// Message system exception prototypes 188// Message system exception prototypes
189void invalid_message_callback(LLMessageSystem*, void*, EMessageException); 189void invalid_message_callback(LLMessageSystem*, void*, EMessageException);
190 190
191void send_lure_911(void** user_data, S32 result);
192
193void process_initiate_download(LLMessageSystem* msg, void**); 191void process_initiate_download(LLMessageSystem* msg, void**);
194void inventory_offer_callback(S32 option, void* user_data); 192void inventory_offer_callback(S32 option, void* user_data);
195 193
@@ -208,15 +206,7 @@ struct LLOfferInfo
208 LLHost mHost; 206 LLHost mHost;
209}; 207};
210 208
211void send_generic_message(const char* method,
212 const std::vector<std::string>& strings,
213 const LLUUID& invoice = LLUUID::null);
214
215void process_generic_message(LLMessageSystem* msg, void**);
216
217void process_feature_disabled_message(LLMessageSystem* msg, void**); 209void process_feature_disabled_message(LLMessageSystem* msg, void**);
218 210
219extern LLDispatcher gGenericDispatcher;
220
221#endif 211#endif
222 212