aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelclassified.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'linden/indra/newview/llpanelclassified.cpp')
-rw-r--r--linden/indra/newview/llpanelclassified.cpp23
1 files changed, 12 insertions, 11 deletions
diff --git a/linden/indra/newview/llpanelclassified.cpp b/linden/indra/newview/llpanelclassified.cpp
index d6ca984..11120e0 100644
--- a/linden/indra/newview/llpanelclassified.cpp
+++ b/linden/indra/newview/llpanelclassified.cpp
@@ -102,16 +102,17 @@ LLPanelClassified::LLPanelClassified(BOOL in_finder)
102 mDataRequested(FALSE), 102 mDataRequested(FALSE),
103 mEnableCommit(FALSE), 103 mEnableCommit(FALSE),
104 mPaidFor(FALSE), 104 mPaidFor(FALSE),
105 mParcelID(),
106 mPosGlobal(), 105 mPosGlobal(),
107 mSnapshotCtrl(NULL), 106 mSnapshotCtrl(NULL),
108 mNameEditor(NULL), 107 mNameEditor(NULL),
109 mLocationEditor(NULL),
110 mDescEditor(NULL), 108 mDescEditor(NULL),
109 mLocationEditor(NULL),
110 mCategoryCombo(NULL),
111 mUpdateBtn(NULL),
111 mTeleportBtn(NULL), 112 mTeleportBtn(NULL),
112 mMapBtn(NULL), 113 mMapBtn(NULL),
113 //mLandmarkBtn(NULL), 114 mProfileBtn(NULL),
114 //mEnabledCheck(NULL), 115 mInfoText(NULL),
115 mMatureCheck(NULL), 116 mMatureCheck(NULL),
116 mAutoRenewCheck(NULL), 117 mAutoRenewCheck(NULL),
117 mSetBtn(NULL), 118 mSetBtn(NULL),
@@ -441,10 +442,10 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
441 LLUUID parcel_id; 442 LLUUID parcel_id;
442 msg->getUUIDFast(_PREHASH_Data, _PREHASH_ParcelID, parcel_id); 443 msg->getUUIDFast(_PREHASH_Data, _PREHASH_ParcelID, parcel_id);
443 444
444 char name[DB_PARCEL_NAME_SIZE]; 445 char name[DB_PARCEL_NAME_SIZE]; /*Flawfinder: ignore*/
445 msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PARCEL_NAME_SIZE, name); 446 msg->getStringFast(_PREHASH_Data, _PREHASH_Name, DB_PARCEL_NAME_SIZE, name);
446 447
447 char desc[DB_PICK_DESC_SIZE]; 448 char desc[DB_PICK_DESC_SIZE]; /*Flawfinder: ignore*/
448 msg->getStringFast(_PREHASH_Data, _PREHASH_Desc, DB_PICK_DESC_SIZE, desc); 449 msg->getStringFast(_PREHASH_Data, _PREHASH_Desc, DB_PICK_DESC_SIZE, desc);
449 450
450 LLUUID snapshot_id; 451 LLUUID snapshot_id;
@@ -452,7 +453,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
452 453
453 // "Location text" is actually the original 454 // "Location text" is actually the original
454 // name that owner gave the parcel, and the location. 455 // name that owner gave the parcel, and the location.
455 char buffer[256]; 456 char buffer[256]; /*Flawfinder: ignore*/
456 LLString location_text; 457 LLString location_text;
457 458
458 msg->getStringFast(_PREHASH_Data, _PREHASH_ParcelName, 256, buffer); 459 msg->getStringFast(_PREHASH_Data, _PREHASH_ParcelName, 256, buffer);
@@ -466,7 +467,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
466 location_text.assign(""); 467 location_text.assign("");
467 } 468 }
468 469
469 char sim_name[256]; 470 char sim_name[256]; /*Flawfinder: ignore*/
470 msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, 256, sim_name); 471 msg->getStringFast(_PREHASH_Data, _PREHASH_SimName, 256, sim_name);
471 472
472 LLVector3d pos_global; 473 LLVector3d pos_global;
@@ -476,7 +477,7 @@ void LLPanelClassified::processClassifiedInfoReply(LLMessageSystem *msg, void **
476 S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS; 477 S32 region_y = llround((F32)pos_global.mdV[VY]) % REGION_WIDTH_UNITS;
477 S32 region_z = llround((F32)pos_global.mdV[VZ]); 478 S32 region_z = llround((F32)pos_global.mdV[VZ]);
478 479
479 sprintf(buffer, "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z); 480 snprintf(buffer, sizeof(buffer), "%s (%d, %d, %d)", sim_name, region_x, region_y, region_z); /*Flawfinder: ignore*/
480 location_text.append(buffer); 481 location_text.append(buffer);
481 482
482 U8 flags; 483 U8 flags;
@@ -762,7 +763,7 @@ void LLPanelClassified::onClickSet(void* data)
762 self->mPosGlobal = gAgent.getPositionGlobal(); 763 self->mPosGlobal = gAgent.getPositionGlobal();
763 764
764 LLString location_text; 765 LLString location_text;
765 location_text.assign("(will update after save)"); 766 location_text.assign("(will update after publish)");
766 location_text.append(", "); 767 location_text.append(", ");
767 768
768 S32 region_x = llround((F32)self->mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS; 769 S32 region_x = llround((F32)self->mPosGlobal.mdV[VX]) % REGION_WIDTH_UNITS;
@@ -804,7 +805,7 @@ void LLPanelClassified::sendClassifiedClickMessage(const char* type)
804 // You're allowed to click on your own ads to reassure yourself 805 // You're allowed to click on your own ads to reassure yourself
805 // that the system is working. 806 // that the system is working.
806 std::vector<std::string> strings; 807 std::vector<std::string> strings;
807 strings.push_back(mClassifiedID.getString()); 808 strings.push_back(mClassifiedID.asString());
808 strings.push_back(type); 809 strings.push_back(type);
809 LLUUID no_invoice; 810 LLUUID no_invoice;
810 send_generic_message("classifiedclick", strings, no_invoice); 811 send_generic_message("classifiedclick", strings, no_invoice);