aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application/OpenSimBase.cs
diff options
context:
space:
mode:
authorMelanie2013-03-22 01:01:24 +0000
committerMelanie2013-03-22 01:01:24 +0000
commit68b910c1ff03d241e2aec65ebe67ffaa58babbf6 (patch)
tree7b59aed339b6d13602b0ba9d65d04b9a920abe00 /OpenSim/Region/Application/OpenSimBase.cs
parentMerge branch 'avination' into careminster (diff)
parentImplement chat across region borders since we can tell if avatars in neighbou... (diff)
downloadopensim-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/OpenSimBase.cs')
0 files changed, 0 insertions, 0 deletions
generated by cgit v1.1 at 2024-09-19 08:08:37 +0000