diff options
| author | Melanie | 2013-03-22 01:01:24 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-22 01:01:24 +0000 |
| commit | 68b910c1ff03d241e2aec65ebe67ffaa58babbf6 (patch) | |
| tree | 7b59aed339b6d13602b0ba9d65d04b9a920abe00 /OpenSim/Region/Application | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Implement chat across region borders since we can tell if avatars in neighbou... (diff) | |
| download | opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.zip opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.gz opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.bz2 opensim-SC_OLD-68b910c1ff03d241e2aec65ebe67ffaa58babbf6.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
Diffstat (limited to 'OpenSim/Region/Application')
0 files changed, 0 insertions, 0 deletions