aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterrate.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/llfloaterrate.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/llfloaterrate.cpp')
-rw-r--r--linden/indra/newview/llfloaterrate.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/linden/indra/newview/llfloaterrate.cpp b/linden/indra/newview/llfloaterrate.cpp
index 128d1e6..a057374 100644
--- a/linden/indra/newview/llfloaterrate.cpp
+++ b/linden/indra/newview/llfloaterrate.cpp
@@ -68,6 +68,8 @@ LLFloaterRate::LLFloaterRate(const std::string& name, const LLUUID &id)
68 68
69 childSetAction("OK", onClickOK, this); 69 childSetAction("OK", onClickOK, this);
70 childSetAction("Cancel", onClickCancel, this); 70 childSetAction("Cancel", onClickCancel, this);
71
72 mObjectSelection = gSelectMgr->getEditSelection();
71} 73}
72 74
73 75
@@ -82,8 +84,8 @@ void LLFloaterRate::draw()
82 LLString name; 84 LLString name;
83 85
84 // Construct the name, if possible 86 // Construct the name, if possible
85 char firstname[MAX_STRING]; 87 char firstname[MAX_STRING]; /* Flawfinder: ignore */
86 char lastname[MAX_STRING]; 88 char lastname[MAX_STRING]; /* Flawfinder: ignore */
87 gCacheName->getName(mAvatarID, firstname, lastname); 89 gCacheName->getName(mAvatarID, firstname, lastname);
88 name.assign(firstname); 90 name.assign(firstname);
89 name.append(" "); 91 name.append(" ");
@@ -127,7 +129,7 @@ void LLFloaterRate::show(const LLUUID &avatar_id)
127 if (iter != sInstanceMap.end()) 129 if (iter != sInstanceMap.end())
128 { 130 {
129 iter->second->setFocus(TRUE); 131 iter->second->setFocus(TRUE);
130 iter->second->open(); 132 iter->second->open(); /* Flawfinder: ignore */
131 } 133 }
132 else if (avatar_id != LLUUID::null) 134 else if (avatar_id != LLUUID::null)
133 { 135 {
@@ -136,7 +138,7 @@ void LLFloaterRate::show(const LLUUID &avatar_id)
136 f->center(); 138 f->center();
137 f->setFocus(TRUE); 139 f->setFocus(TRUE);
138 f->sendReputationIndividualRequest(avatar_id); 140 f->sendReputationIndividualRequest(avatar_id);
139 f->open(); 141 f->open(); /* Flawfinder: ignore */
140 } 142 }
141} 143}
142 144
@@ -166,10 +168,6 @@ void LLFloaterRate::show(ERateSelection which)
166 { 168 {
167 gViewerWindow->alertXml("SelectSingleRate"); 169 gViewerWindow->alertXml("SelectSingleRate");
168 } 170 }
169
170
171 // Clean up selection
172 gSelectMgr->deselectTransient();
173} 171}
174 172
175 173