aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloateravatartextures.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:50 -0500
committerJacek Antonelli2008-08-15 23:44:50 -0500
commit89fe5dab825a62a0e3fd8d248cbc91c65eb2a426 (patch)
treebcff14b7888d04a2fec799c59369f6095224bd08 /linden/indra/newview/llfloateravatartextures.cpp
parentSecond Life viewer sources 1.13.3.2 (diff)
downloadmeta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.zip
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.gz
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.bz2
meta-impy-89fe5dab825a62a0e3fd8d248cbc91c65eb2a426.tar.xz
Second Life viewer sources 1.14.0.0
Diffstat (limited to 'linden/indra/newview/llfloateravatartextures.cpp')
-rw-r--r--linden/indra/newview/llfloateravatartextures.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/linden/indra/newview/llfloateravatartextures.cpp b/linden/indra/newview/llfloateravatartextures.cpp
index 8ff65ab..d7d7dfc 100644
--- a/linden/indra/newview/llfloateravatartextures.cpp
+++ b/linden/indra/newview/llfloateravatartextures.cpp
@@ -54,7 +54,7 @@ LLFloaterAvatarTextures* LLFloaterAvatarTextures::show(const LLUUID &id)
54 gUICtrlFactory->buildFloater(floaterp, "floater_avatar_textures.xml"); 54 gUICtrlFactory->buildFloater(floaterp, "floater_avatar_textures.xml");
55 55
56 gFloaterView->addChild(floaterp); 56 gFloaterView->addChild(floaterp);
57 floaterp->open(); 57 floaterp->open(); /*Flawfinder: ignore*/
58 58
59 gFloaterView->adjustToFitScreen(floaterp, FALSE); 59 gFloaterView->adjustToFitScreen(floaterp, FALSE);
60 60
@@ -110,7 +110,7 @@ static void update_texture_ctrl(LLVOAvatar* avatarp,
110 else 110 else
111 { 111 {
112 ctrl->setImageAssetID(id); 112 ctrl->setImageAssetID(id);
113 ctrl->setToolTip(id.getString()); 113 ctrl->setToolTip(id.asString());
114 } 114 }
115} 115}
116 116
@@ -138,8 +138,8 @@ void LLFloaterAvatarTextures::refresh()
138 LLVOAvatar *avatarp = find_avatar(mID); 138 LLVOAvatar *avatarp = find_avatar(mID);
139 if (avatarp) 139 if (avatarp)
140 { 140 {
141 char firstname[DB_FIRST_NAME_BUF_SIZE]; 141 char firstname[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
142 char lastname[DB_LAST_NAME_BUF_SIZE]; 142 char lastname[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/
143 if (gCacheName->getName(avatarp->getID(), firstname, lastname)) 143 if (gCacheName->getName(avatarp->getID(), firstname, lastname))
144 { 144 {
145 LLString name; 145 LLString name;
@@ -175,7 +175,7 @@ void LLFloaterAvatarTextures::refresh()
175 } 175 }
176 else 176 else
177 { 177 {
178 setTitle(mTitle + ": INVALID AVATAR (" + mID.getString() + ")"); 178 setTitle(mTitle + ": INVALID AVATAR (" + mID.asString() + ")");
179 } 179 }
180#endif 180#endif
181} 181}