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/llinventory | |
| 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/llinventory')
| -rw-r--r-- | indra/llinventory/lluserrelations.h | 2 |
1 files changed, 1 insertions, 1 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. |