diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-06-17 22:27:09 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-06-17 22:27:09 +0000 |
| commit | 2638f12f95eea692502836cf6548b4a0b234d009 (patch) | |
| tree | c0028664d731a44cbd630a6ac10aadf095b1f1a1 /indra | |
| parent | f118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (diff) | |
svn merge -r 63833:63894 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-17-0 --> release
Pick up patches committed to 1.17:
* Commented out metrics code that seems to be causing a crash.
* Adding metrics to deployed code. added missing __hash__ function to lluuid.py, which fixes using uuid's as keys in maps
* Reverting fix for SL-25905; probably cause of script-vieweing exploit on agni.
* Removed deploy key checks from farm
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/llinventory/lluserrelations.h | 2 | ||||
| -rw-r--r-- | indra/newview/llagent.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/llinventorybridge.cpp | 32 |
3 files changed, 9 insertions, 27 deletions
diff --git a/indra/llinventory/lluserrelations.h b/indra/llinventory/lluserrelations.h index ddf6767b23..7c24254339 100644 --- a/indra/llinventory/lluserrelations.h +++ b/indra/llinventory/lluserrelations.h @@ -18,7 +18,7 @@ * @class LLRelationship * * This class represents a relationship between two agents, where the - * related agent is stored and the other agent in the relationship is + * related agent is stored and the other agent is the relationship is * implicit by container ownership. * This is merely a cache of this information used by the sim * and viewer. diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index eb00692157..c6155197f6 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4963,7 +4963,7 @@ BOOL LLAgent::allowOperation(PermissionBit op, const LLPermissions& perm, U64 group_proxy_power, U8 god_minimum) - { +{ // Check god level. if (getGodLevel() >= god_minimum) return TRUE; diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index eb59a4355b..4a1d496d6f 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -802,7 +802,7 @@ LLString LLItemBridge::getLabelSuffix() const if(item) { // it's a bit confusing to put nocopy/nomod/etc on calling cards. - if( LLAssetType::AT_CALLINGCARD != item->getType() + if(LLAssetType::AT_CALLINGCARD != item->getType() && item->getPermissions().getOwner() == gAgent.getID()) { BOOL copy = item->getPermissions().allowCopyBy(gAgent.getID()); @@ -814,32 +814,14 @@ LLString LLItemBridge::getLabelSuffix() const const char* NO_MOD = " (no modify)"; const char* NO_XFER = " (no transfer)"; const char* scopy; - if(copy) - { - scopy = EMPTY; - } - else - { - scopy = NO_COPY; - }; + if(copy) scopy = EMPTY; + else scopy = NO_COPY; const char* smod; - if(mod) - { - smod = EMPTY; - } - else - { - smod = NO_MOD; - }; + if(mod) smod = EMPTY; + else smod = NO_MOD; const char* sxfer; - if(xfer) - { - sxfer = EMPTY; - } - else - { - sxfer = NO_XFER; - }; + if(xfer) sxfer = EMPTY; + else sxfer = NO_XFER; char buffer[MAX_STRING]; /*Flawfinder: ignore*/ snprintf( /* Flawfinder: ignore */ buffer, |