diff options
author | Jacek Antonelli | 2008-09-06 18:24:57 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-09-06 18:25:07 -0500 |
commit | 798d367d54a6c6379ad355bd8345fa40e31e7fe9 (patch) | |
tree | 1921f1708cd0240648c97bc02df2c2ab5f2fc41e /linden/indra/newview/llviewermessage.h | |
parent | Second Life viewer sources 1.20.15 (diff) | |
download | meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.zip meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.gz meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.bz2 meta-impy-798d367d54a6c6379ad355bd8345fa40e31e7fe9.tar.xz |
Second Life viewer sources 1.21.0-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llviewermessage.h | 33 |
1 files changed, 12 insertions, 21 deletions
diff --git a/linden/indra/newview/llviewermessage.h b/linden/indra/newview/llviewermessage.h index 5abd9d1..a4bae57 100644 --- a/linden/indra/newview/llviewermessage.h +++ b/linden/indra/newview/llviewermessage.h | |||
@@ -61,7 +61,7 @@ enum InventoryOfferResponse | |||
61 | 61 | ||
62 | BOOL can_afford_transaction(S32 cost); | 62 | BOOL can_afford_transaction(S32 cost); |
63 | void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group = FALSE, | 63 | void give_money(const LLUUID& uuid, LLViewerRegion* region, S32 amount, BOOL is_group = FALSE, |
64 | S32 trx_type = TRANS_GIFT, const LLString& desc = LLString::null); | 64 | S32 trx_type = TRANS_GIFT, const std::string& desc = LLStringUtil::null); |
65 | void busy_message (LLMessageSystem* msg, LLUUID from_id); | 65 | void busy_message (LLMessageSystem* msg, LLUUID from_id); |
66 | 66 | ||
67 | void process_logout_reply(LLMessageSystem* msg, void**); | 67 | void process_logout_reply(LLMessageSystem* msg, void**); |
@@ -139,13 +139,13 @@ void process_teleport_local(LLMessageSystem *msg,void**); | |||
139 | void process_user_sim_location_reply(LLMessageSystem *msg,void**); | 139 | void process_user_sim_location_reply(LLMessageSystem *msg,void**); |
140 | 140 | ||
141 | void send_simple_im(const LLUUID& to_id, | 141 | void send_simple_im(const LLUUID& to_id, |
142 | const char* message, | 142 | const std::string& message, |
143 | EInstantMessage dialog = IM_NOTHING_SPECIAL, | 143 | EInstantMessage dialog = IM_NOTHING_SPECIAL, |
144 | const LLUUID& id = LLUUID::null); | 144 | const LLUUID& id = LLUUID::null); |
145 | 145 | ||
146 | void send_group_notice(const LLUUID& group_id, | 146 | void send_group_notice(const LLUUID& group_id, |
147 | const char* subject, | 147 | const std::string& subject, |
148 | const char* message, | 148 | const std::string& message, |
149 | const LLInventoryItem* item); | 149 | const LLInventoryItem* item); |
150 | 150 | ||
151 | void handle_lure(const LLUUID& invitee); | 151 | void handle_lure(const LLUUID& invitee); |
@@ -154,8 +154,8 @@ void handle_lure(LLDynamicArray<LLUUID>& ids); | |||
154 | // always from gAgent and | 154 | // always from gAgent and |
155 | // routes through the gAgent's current simulator | 155 | // routes through the gAgent's current simulator |
156 | void send_improved_im(const LLUUID& to_id, | 156 | void send_improved_im(const LLUUID& to_id, |
157 | const char* name, | 157 | const std::string& name, |
158 | const char* message, | 158 | const std::string& message, |
159 | U8 offline = IM_ONLINE, | 159 | U8 offline = IM_ONLINE, |
160 | EInstantMessage dialog = IM_NOTHING_SPECIAL, | 160 | EInstantMessage dialog = IM_NOTHING_SPECIAL, |
161 | const LLUUID& id = LLUUID::null, | 161 | const LLUUID& id = LLUUID::null, |
@@ -165,18 +165,15 @@ void send_improved_im(const LLUUID& to_id, | |||
165 | 165 | ||
166 | void process_user_info_reply(LLMessageSystem* msg, void**); | 166 | void process_user_info_reply(LLMessageSystem* msg, void**); |
167 | 167 | ||
168 | // method to format the time. Buffer should be at least | 168 | // method to format the time. |
169 | // TIME_STR_LENGTH long, and the function reutnrs buffer (for use in | 169 | std::string formatted_time(const time_t& the_time); |
170 | // sprintf and the like) | ||
171 | const S32 TIME_STR_LENGTH = 30; | ||
172 | char* formatted_time(const time_t& the_time, char* buffer); | ||
173 | 170 | ||
174 | void send_places_query(const LLUUID& query_id, | 171 | void send_places_query(const LLUUID& query_id, |
175 | const LLUUID& trans_id, | 172 | const LLUUID& trans_id, |
176 | const char* query_text, | 173 | const std::string& query_text, |
177 | U32 query_flags, | 174 | U32 query_flags, |
178 | S32 category, | 175 | S32 category, |
179 | const char* sim_name); | 176 | const std::string& sim_name); |
180 | void process_script_dialog(LLMessageSystem* msg, void**); | 177 | void process_script_dialog(LLMessageSystem* msg, void**); |
181 | void process_load_url(LLMessageSystem* msg, void**); | 178 | void process_load_url(LLMessageSystem* msg, void**); |
182 | void process_script_teleport_request(LLMessageSystem* msg, void**); | 179 | void process_script_teleport_request(LLMessageSystem* msg, void**); |
@@ -185,12 +182,6 @@ void onCovenantLoadComplete(LLVFS *vfs, | |||
185 | const LLUUID& asset_uuid, | 182 | const LLUUID& asset_uuid, |
186 | LLAssetType::EType type, | 183 | LLAssetType::EType type, |
187 | void* user_data, S32 status, LLExtStat ext_status); | 184 | void* user_data, S32 status, LLExtStat ext_status); |
188 | void callbackCacheEstateOwnerName( | ||
189 | const LLUUID& id, | ||
190 | const char* first, | ||
191 | const char* last, | ||
192 | BOOL is_group, | ||
193 | void*); | ||
194 | 185 | ||
195 | // calling cards | 186 | // calling cards |
196 | void process_offer_callingcard(LLMessageSystem* msg, void**); | 187 | void process_offer_callingcard(LLMessageSystem* msg, void**); |
@@ -214,8 +205,8 @@ struct LLOfferInfo | |||
214 | LLUUID mFolderID; | 205 | LLUUID mFolderID; |
215 | LLUUID mObjectID; | 206 | LLUUID mObjectID; |
216 | LLAssetType::EType mType; | 207 | LLAssetType::EType mType; |
217 | LLString mFromName; | 208 | std::string mFromName; |
218 | LLString mDesc; | 209 | std::string mDesc; |
219 | LLHost mHost; | 210 | LLHost mHost; |
220 | }; | 211 | }; |
221 | 212 | ||