aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llinventorybridge.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llinventorybridge.cpp32
1 files changed, 7 insertions, 25 deletions
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 0d5c30e..27be9f6 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -822,7 +822,7 @@ LLString LLItemBridge::getLabelSuffix() const
822 if(item) 822 if(item)
823 { 823 {
824 // it's a bit confusing to put nocopy/nomod/etc on calling cards. 824 // it's a bit confusing to put nocopy/nomod/etc on calling cards.
825 if( LLAssetType::AT_CALLINGCARD != item->getType() 825 if(LLAssetType::AT_CALLINGCARD != item->getType()
826 && item->getPermissions().getOwner() == gAgent.getID()) 826 && item->getPermissions().getOwner() == gAgent.getID())
827 { 827 {
828 BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID()); 828 BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID());
@@ -834,32 +834,14 @@ LLString LLItemBridge::getLabelSuffix() const
834 const char* NO_MOD = " (no modify)"; 834 const char* NO_MOD = " (no modify)";
835 const char* NO_XFER = " (no transfer)"; 835 const char* NO_XFER = " (no transfer)";
836 const char* scopy; 836 const char* scopy;
837 if(copy) 837 if(copy) scopy = EMPTY;
838 { 838 else scopy = NO_COPY;
839 scopy = EMPTY;
840 }
841 else
842 {
843 scopy = NO_COPY;
844 };
845 const char* smod; 839 const char* smod;
846 if(mod) 840 if(mod) smod = EMPTY;
847 { 841 else smod = NO_MOD;
848 smod = EMPTY;
849 }
850 else
851 {
852 smod = NO_MOD;
853 };
854 const char* sxfer; 842 const char* sxfer;
855 if(xfer) 843 if(xfer) sxfer = EMPTY;
856 { 844 else sxfer = NO_XFER;
857 sxfer = EMPTY;
858 }
859 else
860 {
861 sxfer = NO_XFER;
862 };
863 char buffer[MAX_STRING]; /*Flawfinder: ignore*/ 845 char buffer[MAX_STRING]; /*Flawfinder: ignore*/
864 snprintf( /* Flawfinder: ignore */ 846 snprintf( /* Flawfinder: ignore */
865 buffer, 847 buffer,