diff options
| author | Josh Bell <josh@lindenlab.com> | 2007-02-02 18:05:29 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2007-02-02 18:05:29 +0000 |
| commit | 57be416ab7c9d93196231fb55de8ba563f3b29eb (patch) | |
| tree | a678b2e965a95cc0c237d84b5dce900d38241467 /indra/newview/llviewercontrol.h | |
| parent | 305c74d5163c5e344a675d39ca2394a9e45bd2c2 (diff) | |
svn merge -r 57502:57551 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3
svn merge -r 57565:57604 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-13-3
(skips 57565, a merge from release. being picky.)
Pick up fixes for:
* Offer Teleport in profiles
* Setting 'none' group
* agni_check_parcel_auctions exception (pushed live already)
Diffstat (limited to 'indra/newview/llviewercontrol.h')
0 files changed, 0 insertions, 0 deletions