aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llimview.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:45:50 -0500
committerJacek Antonelli2008-08-15 23:45:50 -0500
commit2a4dea528f670b9bb1f77ef27a8a1dd16603d114 (patch)
tree95c68e362703c9099d571ecbdc6142b1cda1e005 /linden/indra/newview/llimview.h
parentSecond Life viewer sources 1.20.6 (diff)
downloadmeta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.zip
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.gz
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.bz2
meta-impy-2a4dea528f670b9bb1f77ef27a8a1dd16603d114.tar.xz
Second Life viewer sources 1.20.7
Diffstat (limited to 'linden/indra/newview/llimview.h')
-rw-r--r--linden/indra/newview/llimview.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/linden/indra/newview/llimview.h b/linden/indra/newview/llimview.h
index 44cb992..b2621e8 100644
--- a/linden/indra/newview/llimview.h
+++ b/linden/indra/newview/llimview.h
@@ -65,7 +65,8 @@ public:
65 EInstantMessage dialog = IM_NOTHING_SPECIAL, 65 EInstantMessage dialog = IM_NOTHING_SPECIAL,
66 U32 parent_estate_id = 0, 66 U32 parent_estate_id = 0,
67 const LLUUID& region_id = LLUUID::null, 67 const LLUUID& region_id = LLUUID::null,
68 const LLVector3& position = LLVector3::zero); 68 const LLVector3& position = LLVector3::zero,
69 bool link_name = false);
69 70
70 void addSystemMessage(const LLUUID& session_id, const LLString& message_name, const LLString::format_map_t& args); 71 void addSystemMessage(const LLUUID& session_id, const LLString& message_name, const LLString::format_map_t& args);
71 72
@@ -192,6 +193,7 @@ private:
192 // reduce 'hello' messages to the linden employees unlucky enough 193 // reduce 'hello' messages to the linden employees unlucky enough
193 // to have their calling card in the default inventory. 194 // to have their calling card in the default inventory.
194 void noteOfflineUsers(LLFloaterIMPanel* panel, const LLDynamicArray<LLUUID>& ids); 195 void noteOfflineUsers(LLFloaterIMPanel* panel, const LLDynamicArray<LLUUID>& ids);
196 void noteMutedUsers(LLFloaterIMPanel* panel, const LLDynamicArray<LLUUID>& ids);
195 197
196 void processIMTypingCore(const LLIMInfo* im_info, BOOL typing); 198 void processIMTypingCore(const LLIMInfo* im_info, BOOL typing);
197 199