aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llfloaterproperties.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/newview/llfloaterproperties.cpp
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/newview/llfloaterproperties.cpp')
-rw-r--r--linden/indra/newview/llfloaterproperties.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/linden/indra/newview/llfloaterproperties.cpp b/linden/indra/newview/llfloaterproperties.cpp
index 0beea67..546270e 100644
--- a/linden/indra/newview/llfloaterproperties.cpp
+++ b/linden/indra/newview/llfloaterproperties.cpp
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2002-2007, Linden Research, Inc. 5 * Copyright (c) 2002-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -434,27 +435,27 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
434 435
435 char perm_string[11]; /* Flawfinder: ignore */ 436 char perm_string[11]; /* Flawfinder: ignore */
436 437
437 snprintf(perm_string, sizeof(perm_string), "B: "); /* Flawfinder: ignore */ 438 snprintf(perm_string, sizeof(perm_string), "B: "); /* Flawfinder: ignore */
438 mask_to_string(base_mask, perm_string+3); 439 mask_to_string(base_mask, perm_string+3);
439 childSetText("BaseMaskDebug",perm_string); 440 childSetText("BaseMaskDebug",perm_string);
440 childSetVisible("BaseMaskDebug",TRUE); 441 childSetVisible("BaseMaskDebug",TRUE);
441 442
442 snprintf(perm_string, sizeof(perm_string), "O: "); /* Flawfinder: ignore */ 443 snprintf(perm_string, sizeof(perm_string), "O: "); /* Flawfinder: ignore */
443 mask_to_string(owner_mask, perm_string+3); 444 mask_to_string(owner_mask, perm_string+3);
444 childSetText("OwnerMaskDebug",perm_string); 445 childSetText("OwnerMaskDebug",perm_string);
445 childSetVisible("OwnerMaskDebug",TRUE); 446 childSetVisible("OwnerMaskDebug",TRUE);
446 447
447 snprintf(perm_string, sizeof(perm_string), "G%s: ", overwrite_group ? "*" : ""); /* Flawfinder: ignore */ 448 snprintf(perm_string, sizeof(perm_string), "G%s: ", overwrite_group ? "*" : ""); /* Flawfinder: ignore */
448 mask_to_string(group_mask, perm_string + (overwrite_group ? 4 : 3)); 449 mask_to_string(group_mask, perm_string + (overwrite_group ? 4 : 3));
449 childSetText("GroupMaskDebug",perm_string); 450 childSetText("GroupMaskDebug",perm_string);
450 childSetVisible("GroupMaskDebug",TRUE); 451 childSetVisible("GroupMaskDebug",TRUE);
451 452
452 snprintf(perm_string, sizeof(perm_string), "E%s: ", overwrite_everyone ? "*" : ""); /* Flawfinder: ignore */ 453 snprintf(perm_string, sizeof(perm_string), "E%s: ", overwrite_everyone ? "*" : ""); /* Flawfinder: ignore */
453 mask_to_string(everyone_mask, perm_string + (overwrite_everyone ? 4 : 3)); 454 mask_to_string(everyone_mask, perm_string + (overwrite_everyone ? 4 : 3));
454 childSetText("EveryoneMaskDebug",perm_string); 455 childSetText("EveryoneMaskDebug",perm_string);
455 childSetVisible("EveryoneMaskDebug",TRUE); 456 childSetVisible("EveryoneMaskDebug",TRUE);
456 457
457 snprintf(perm_string, sizeof(perm_string), "N%s: ", slam_perm ? "*" : ""); /* Flawfinder: ignore */ 458 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)); 459 mask_to_string(next_owner_mask, perm_string + (slam_perm ? 4 : 3));
459 childSetText("NextMaskDebug",perm_string); 460 childSetText("NextMaskDebug",perm_string);
460 childSetVisible("NextMaskDebug",TRUE); 461 childSetVisible("NextMaskDebug",TRUE);
@@ -568,7 +569,7 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
568 { 569 {
569 radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1); 570 radioSaleType->setSelectedIndex((S32)sale_info.getSaleType() - 1);
570 char numerical_price[MAX_STRING]; /* Flawfinder: ignore */ 571 char numerical_price[MAX_STRING]; /* Flawfinder: ignore */
571 snprintf(numerical_price, MAX_STRING, "%d", sale_info.getSalePrice()); /* Flawfinder: ignore */ 572 snprintf(numerical_price, MAX_STRING, "%d", sale_info.getSalePrice()); /* Flawfinder: ignore */
572 childSetText("EditPrice",numerical_price); 573 childSetText("EditPrice",numerical_price);
573 } 574 }
574 else 575 else