aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/RegionSettings.cs
diff options
context:
space:
mode:
authorMelanie2013-04-30 23:45:38 +0100
committerMelanie2013-04-30 23:45:38 +0100
commitb89d18e6f4a1099fe031ebf10776a752826604b9 (patch)
treeb964e6b167e156dc2adeddeb733d93eac342e9c0 /OpenSim/Framework/RegionSettings.cs
parentMerge branch 'master' into careminster (diff)
parentBulletSim: fix error messages created while an avatar has no initial (diff)
downloadopensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.zip
opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.gz
opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.bz2
opensim-SC-b89d18e6f4a1099fe031ebf10776a752826604b9.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Framework/RegionSettings.cs')
0 files changed, 0 insertions, 0 deletions