diff options
Diffstat (limited to 'linden/indra/newview/llfloateravatarpicker.cpp')
-rw-r--r-- | linden/indra/newview/llfloateravatarpicker.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloateravatarpicker.cpp b/linden/indra/newview/llfloateravatarpicker.cpp index 50f7387..a2ea8c2 100644 --- a/linden/indra/newview/llfloateravatarpicker.cpp +++ b/linden/indra/newview/llfloateravatarpicker.cpp | |||
@@ -42,7 +42,7 @@ | |||
42 | #include "llscrolllistctrl.h" | 42 | #include "llscrolllistctrl.h" |
43 | #include "lltextbox.h" | 43 | #include "lltextbox.h" |
44 | #include "llvieweruictrlfactory.h" | 44 | #include "llvieweruictrlfactory.h" |
45 | #include "viewer.h" | 45 | #include "llagent.h" |
46 | 46 | ||
47 | const S32 MIN_WIDTH = 200; | 47 | const S32 MIN_WIDTH = 200; |
48 | const S32 MIN_HEIGHT = 340; | 48 | const S32 MIN_HEIGHT = 340; |
@@ -265,13 +265,13 @@ void LLFloaterAvatarPicker::find() | |||
265 | 265 | ||
266 | msg->newMessage("AvatarPickerRequest"); | 266 | msg->newMessage("AvatarPickerRequest"); |
267 | msg->nextBlock("AgentData"); | 267 | msg->nextBlock("AgentData"); |
268 | msg->addUUID("AgentID", agent_get_id()); | 268 | msg->addUUID("AgentID", gAgent.getID()); |
269 | msg->addUUID("SessionID", agent_get_session_id()); | 269 | msg->addUUID("SessionID", gAgent.getSessionID()); |
270 | msg->addUUID("QueryID", mQueryID); // not used right now | 270 | msg->addUUID("QueryID", mQueryID); // not used right now |
271 | msg->nextBlock("Data"); | 271 | msg->nextBlock("Data"); |
272 | msg->addString("Name", text); | 272 | msg->addString("Name", text); |
273 | 273 | ||
274 | agent_send_reliable_message(); | 274 | gAgent.sendReliableMessage(); |
275 | 275 | ||
276 | if (mListNames) | 276 | if (mListNames) |
277 | { | 277 | { |
@@ -309,7 +309,7 @@ void LLFloaterAvatarPicker::processAvatarPickerReply(LLMessageSystem* msg, void* | |||
309 | msg->getUUID("AgentData", "QueryID", query_id); | 309 | msg->getUUID("AgentData", "QueryID", query_id); |
310 | 310 | ||
311 | // Not for us | 311 | // Not for us |
312 | if (agent_id != agent_get_id()) return; | 312 | if (agent_id != gAgent.getID()) return; |
313 | 313 | ||
314 | // Dialog already closed | 314 | // Dialog already closed |
315 | LLFloaterAvatarPicker *self = sInstance; | 315 | LLFloaterAvatarPicker *self = sInstance; |