aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateravatarinfo.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llfloateravatarinfo.cpp')
-rw-r--r--linden/indra/newview/llfloateravatarinfo.cpp26
1 files changed, 9 insertions, 17 deletions
diff --git a/linden/indra/newview/llfloateravatarinfo.cpp b/linden/indra/newview/llfloateravatarinfo.cpp
index 959967a..ef34542 100644
--- a/linden/indra/newview/llfloateravatarinfo.cpp
+++ b/linden/indra/newview/llfloateravatarinfo.cpp
@@ -104,17 +104,8 @@ void* LLFloaterAvatarInfo::createPanelAvatar(void* data)
104//---------------------------------------------------------------------------- 104//----------------------------------------------------------------------------
105 105
106 106
107// static
108void LLFloaterAvatarInfo::onCommitNotes(LLUICtrl*, void* userdata)
109{
110 LLFloaterAvatarInfo* self = (LLFloaterAvatarInfo*)userdata;
111
112 self->mPanelAvatarp->sendAvatarNotesUpdate();
113}
114
115BOOL LLFloaterAvatarInfo::postBuild() 107BOOL LLFloaterAvatarInfo::postBuild()
116{ 108{
117
118 return TRUE; 109 return TRUE;
119} 110}
120 111
@@ -164,7 +155,9 @@ void LLFloaterAvatarInfo::resetGroupList()
164 155
165// Open profile to a certian tab. 156// Open profile to a certian tab.
166// static 157// static
167void LLFloaterAvatarInfo::showFromObject(const LLUUID &avatar_id, std::string tab_name) 158void LLFloaterAvatarInfo::showFromObject(
159 const LLUUID& avatar_id,
160 std::string tab_name)
168{ 161{
169 if(avatar_id.isNull()) 162 if(avatar_id.isNull())
170 { 163 {
@@ -185,9 +178,8 @@ void LLFloaterAvatarInfo::showFromObject(const LLUUID &avatar_id, std::string ta
185 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO); 178 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
186 179
187 } 180 }
188
189 floater->mPanelAvatarp->selectTabByName(tab_name); 181 floater->mPanelAvatarp->selectTabByName(tab_name);
190 floater->open(); 182 floater->open(); /*Flawfinder: ignore*/
191} 183}
192 184
193// static 185// static
@@ -203,7 +195,7 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
203 { 195 {
204 // ...bring that window to front 196 // ...bring that window to front
205 floater = gAvatarInfoInstances.getData(avatar_id); 197 floater = gAvatarInfoInstances.getData(avatar_id);
206 floater->open(); 198 floater->open(); /*Flawfinder: ignore*/
207 } 199 }
208 else 200 else
209 { 201 {
@@ -211,7 +203,7 @@ void LLFloaterAvatarInfo::showFromDirectory(const LLUUID &avatar_id)
211 avatar_id); 203 avatar_id);
212 floater->center(); 204 floater->center();
213 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO); 205 floater->mPanelAvatarp->setAvatarID(avatar_id, "", ONLINE_STATUS_NO);
214 floater->open(); 206 floater->open(); /*Flawfinder: ignore*/
215 } 207 }
216 if(floater) 208 if(floater)
217 { 209 {
@@ -227,14 +219,14 @@ void LLFloaterAvatarInfo::showFromAvatar(LLViewerObject *avatar)
227 { 219 {
228 // ...bring that window to front 220 // ...bring that window to front
229 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData(avatar->getID()); 221 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData(avatar->getID());
230 f->open(); 222 f->open(); /*Flawfinder: ignore*/
231 } 223 }
232 else 224 else
233 { 225 {
234 LLFloaterAvatarInfo *floater = new LLFloaterAvatarInfo("avatarinfo", FAI_RECT, 226 LLFloaterAvatarInfo *floater = new LLFloaterAvatarInfo("avatarinfo", FAI_RECT,
235 avatar->getID() ); 227 avatar->getID() );
236 floater->center(); 228 floater->center();
237 floater->open(); 229 floater->open(); /*Flawfinder: ignore*/
238 } 230 }
239} 231}
240 232
@@ -250,7 +242,7 @@ void LLFloaterAvatarInfo::showFromFriend(const LLUUID& agent_id, BOOL online)
250 { 242 {
251 // ...bring that window to front 243 // ...bring that window to front
252 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData( agent_id ); 244 LLFloaterAvatarInfo *f = gAvatarInfoInstances.getData( agent_id );
253 f->open(); 245 f->open(); /*Flawfinder: ignore*/
254 } 246 }
255 else 247 else
256 { 248 {