summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterpostcard.cpp
diff options
context:
space:
mode:
authorJosh Bell <josh@lindenlab.com>2007-06-17 22:27:09 +0000
committerJosh Bell <josh@lindenlab.com>2007-06-17 22:27:09 +0000
commit2638f12f95eea692502836cf6548b4a0b234d009 (patch)
treec0028664d731a44cbd630a6ac10aadf095b1f1a1 /indra/newview/llfloaterpostcard.cpp
parentf118e7c80b95d8c0a0c8abb14ff379b6697e01b6 (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/newview/llfloaterpostcard.cpp')
0 files changed, 0 insertions, 0 deletions