aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Avatar/Chat
diff options
context:
space:
mode:
authorMelanie2012-06-02 01:40:42 +0100
committerMelanie2012-06-02 01:40:42 +0100
commit522f36345d4e07d2ec0ff86f2b6e0b56c07607e0 (patch)
tree571c5e5197dd5246a86b5c074ef9692c498565a7 /OpenSim/Region/OptionalModules/Avatar/Chat
parentMerge branch 'avination' into careminster (diff)
parentInstead of updating sim stats root agent, child, objects and scripts accounts... (diff)
downloadopensim-SC-522f36345d4e07d2ec0ff86f2b6e0b56c07607e0.zip
opensim-SC-522f36345d4e07d2ec0ff86f2b6e0b56c07607e0.tar.gz
opensim-SC-522f36345d4e07d2ec0ff86f2b6e0b56c07607e0.tar.bz2
opensim-SC-522f36345d4e07d2ec0ff86f2b6e0b56c07607e0.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/Chat')
0 files changed, 0 insertions, 0 deletions