diff options
| author | Mike Antipov <mantipov@productengine.com> | 2010-07-27 16:46:37 +0300 |
|---|---|---|
| committer | Mike Antipov <mantipov@productengine.com> | 2010-07-27 16:46:37 +0300 |
| commit | 17fdce0ef24b863c6922f18d6e29d2b55d43b1b5 (patch) | |
| tree | dbbd8aba567b6daeb1eecb7264a49fbd8bf531d8 /indra/newview/lltoolobjpicker.cpp | |
| parent | 0fde0686744b2c17c0ea4c0163da45e8e4648381 (diff) | |
| parent | 8c2ccb5ed3b2acdf562acf0c1a180215d49742c8 (diff) | |
Merge with head.
Resolved conflict in indra/newview/lloutfitslist.cpp to use changes from viewer-release.
Rejected changes in that file coming with 10f02c59761c (EXT-7015 FIXED Avoided wearing item moved to trash.) It will be refixed in a separate commit.
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lltoolobjpicker.cpp')
0 files changed, 0 insertions, 0 deletions