aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterproperties.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llfloaterproperties.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 8be2ce5..0beea67 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -126,7 +126,7 @@ LLFloaterProperties* LLFloaterProperties::show(const LLUUID& item_id,
126 } 126 }
127 127
128 instance->refresh(); 128 instance->refresh();
129 instance->open(); 129 instance->open(); /* Flawfinder: ignore */
130 } 130 }
131 return instance; 131 return instance;
132} 132}
@@ -233,7 +233,7 @@ void LLFloaterProperties::refresh()
233 "RadioSaleType", 233 "RadioSaleType",
234 "EditPrice" 234 "EditPrice"
235 }; 235 };
236 for(int t=0;t<sizeof(enableNames)/sizeof(char*);t++) 236 for(size_t t=0; t<sizeof(enableNames)/sizeof(char*); ++t)
237 { 237 {
238 childSetEnabled(enableNames[t],false); 238 childSetEnabled(enableNames[t],false);
239 } 239 }
@@ -244,7 +244,7 @@ void LLFloaterProperties::refresh()
244 "EveryoneMaskDebug", 244 "EveryoneMaskDebug",
245 "NextMaskDebug" 245 "NextMaskDebug"
246 }; 246 };
247 for(int t=0;t<sizeof(hideNames)/sizeof(char*);t++) 247 for(size_t t=0; t<sizeof(hideNames)/sizeof(char*); ++t)
248 { 248 {
249 childSetVisible(hideNames[t],false); 249 childSetVisible(hideNames[t],false);
250 } 250 }
@@ -298,7 +298,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
298 298
299 childSetEnabled("LabelItemNameTitle",TRUE); 299 childSetEnabled("LabelItemNameTitle",TRUE);
300 childSetEnabled("LabelItemName",is_modifiable); 300 childSetEnabled("LabelItemName",is_modifiable);
301 const char EMPTY_STRING[1] = ""; 301 const char EMPTY_STRING[1] = ""; /* Flawfinder: ignore */
302 const char* txt = EMPTY_STRING; 302 const char* txt = EMPTY_STRING;
303 if(!item->getName().empty()) 303 if(!item->getName().empty())
304 { 304 {
@@ -318,8 +318,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
318 ////////////////// 318 //////////////////
319 // CREATOR NAME // 319 // CREATOR NAME //
320 ////////////////// 320 //////////////////
321 char first_name[DB_FIRST_NAME_BUF_SIZE]; 321 char first_name[DB_FIRST_NAME_BUF_SIZE]; /* Flawfinder: ignore */
322 char last_name[DB_LAST_NAME_BUF_SIZE]; 322 char last_name[DB_LAST_NAME_BUF_SIZE]; /* Flawfinder: ignore */
323 if(!gCacheName) return; 323 if(!gCacheName) return;
324 if(!gAgent.getRegion()) return; 324 if(!gAgent.getRegion()) return;
325 325
@@ -351,7 +351,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
351 LLString name; 351 LLString name;
352 if (perm.isGroupOwned()) 352 if (perm.isGroupOwned())
353 { 353 {
354 char group_name[DB_GROUP_NAME_BUF_SIZE]; 354 char group_name[DB_GROUP_NAME_BUF_SIZE]; /* Flawfinder: ignore */
355 gCacheName->getGroupName(perm.getGroup(), group_name); 355 gCacheName->getGroupName(perm.getGroup(), group_name);
356 name.assign(group_name); 356 name.assign(group_name);
357 } 357 }
@@ -432,29 +432,29 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
432 overwrite_group = flags & LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP; 432 overwrite_group = flags & LLInventoryItem::II_FLAGS_OBJECT_PERM_OVERWRITE_GROUP;
433 } 433 }
434 434
435 char perm_string[11]; 435 char perm_string[11]; /* Flawfinder: ignore */
436 436
437 sprintf(perm_string, "B: "); 437 snprintf(perm_string, sizeof(perm_string), "B: "); /* Flawfinder: ignore */
438 mask_to_string(base_mask, perm_string+3); 438 mask_to_string(base_mask, perm_string+3);
439 childSetText("BaseMaskDebug",perm_string); 439 childSetText("BaseMaskDebug",perm_string);
440 childSetVisible("BaseMaskDebug",TRUE); 440 childSetVisible("BaseMaskDebug",TRUE);
441 441
442 sprintf(perm_string, "O: "); 442 snprintf(perm_string, sizeof(perm_string), "O: "); /* Flawfinder: ignore */
443 mask_to_string(owner_mask, perm_string+3); 443 mask_to_string(owner_mask, perm_string+3);
444 childSetText("OwnerMaskDebug",perm_string); 444 childSetText("OwnerMaskDebug",perm_string);
445 childSetVisible("OwnerMaskDebug",TRUE); 445 childSetVisible("OwnerMaskDebug",TRUE);
446 446
447 sprintf(perm_string, "G%s: ", overwrite_group ? "*" : ""); 447 snprintf(perm_string, sizeof(perm_string), "G%s: ", overwrite_group ? "*" : ""); /* Flawfinder: ignore */
448 mask_to_string(group_mask, perm_string + (overwrite_group ? 4 : 3)); 448 mask_to_string(group_mask, perm_string + (overwrite_group ? 4 : 3));
449 childSetText("GroupMaskDebug",perm_string); 449 childSetText("GroupMaskDebug",perm_string);
450 childSetVisible("GroupMaskDebug",TRUE); 450 childSetVisible("GroupMaskDebug",TRUE);
451 451
452 sprintf(perm_string, "E%s: ", overwrite_everyone ? "*" : ""); 452 snprintf(perm_string, sizeof(perm_string), "E%s: ", overwrite_everyone ? "*" : ""); /* Flawfinder: ignore */
453 mask_to_string(everyone_mask, perm_string + (overwrite_everyone ? 4 : 3)); 453 mask_to_string(everyone_mask, perm_string + (overwrite_everyone ? 4 : 3));
454 childSetText("EveryoneMaskDebug",perm_string); 454 childSetText("EveryoneMaskDebug",perm_string);
455 childSetVisible("EveryoneMaskDebug",TRUE); 455 childSetVisible("EveryoneMaskDebug",TRUE);
456 456
457 sprintf(perm_string, "N%s: ", slam_perm ? "*" : ""); 457 snprintf(perm_string, sizeof(perm_string), "N%s: ", slam_perm ? "*" : ""); /* Flawfinder: ignore */
458 mask_to_string(next_owner_mask, perm_string + (slam_perm ? 4 : 3)); 458 mask_to_string(next_owner_mask, perm_string + (slam_perm ? 4 : 3));
459 childSetText("NextMaskDebug",perm_string); 459 childSetText("NextMaskDebug",perm_string);
460 childSetVisible("NextMaskDebug",TRUE); 460 childSetVisible("NextMaskDebug",TRUE);
@@ -567,8 +567,8 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
567 if (is_for_sale) 567 if (is_for_sale)
568 { 568 {
569 radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1); 569 radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
570 char numerical_price[MAX_STRING]; 570 char numerical_price[MAX_STRING]; /* Flawfinder: ignore */
571 sprintf(numerical_price, "%d", sale_info.getSalePrice()); 571 snprintf(numerical_price, MAX_STRING, "%d", sale_info.getSalePrice()); /* Flawfinder: ignore */
572 childSetText("EditPrice",numerical_price); 572 childSetText("EditPrice",numerical_price);
573 } 573 }
574 else 574 else