aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloatertopobjects.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/llfloatertopobjects.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/llfloatertopobjects.cpp')
-rw-r--r--linden/indra/newview/llfloatertopobjects.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/linden/indra/newview/llfloatertopobjects.cpp b/linden/indra/newview/llfloatertopobjects.cpp
index 093b840..7c86e83 100644
--- a/linden/indra/newview/llfloatertopobjects.cpp
+++ b/linden/indra/newview/llfloatertopobjects.cpp
@@ -160,8 +160,8 @@ void LLFloaterTopObjects::handleReply(LLMessageSystem *msg, void** data)
160 LLUUID task_id; 160 LLUUID task_id;
161 F32 location_x, location_y, location_z; 161 F32 location_x, location_y, location_z;
162 F32 score; 162 F32 score;
163 char name_buf[MAX_STRING]; 163 char name_buf[MAX_STRING]; /* Flawfinder: ignore */
164 char owner_buf[MAX_STRING]; 164 char owner_buf[MAX_STRING]; /* Flawfinder: ignore */
165 165
166 msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block); 166 msg->getU32Fast(_PREHASH_ReportData, _PREHASH_TaskLocalID, task_local_id, block);
167 msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block); 167 msg->getUUIDFast(_PREHASH_ReportData, _PREHASH_TaskID, task_id, block);
@@ -250,7 +250,7 @@ void LLFloaterTopObjects::updateSelectionInfo()
250 LLUUID object_id = list->getCurrentID(); 250 LLUUID object_id = list->getCurrentID();
251 if (object_id.isNull()) return; 251 if (object_id.isNull()) return;
252 252
253 LLString object_id_string = object_id.getString(); 253 std::string object_id_string = object_id.asString();
254 254
255 childSetValue("id_editor", LLSD(object_id_string)); 255 childSetValue("id_editor", LLSD(object_id_string));
256 childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getText()); 256 childSetValue("object_name_editor", list->getFirstSelected()->getColumn(1)->getText());