aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/Regions
diff options
context:
space:
mode:
authorJonathan Freedman2010-10-29 23:12:51 -0400
committerJonathan Freedman2010-10-29 23:12:51 -0400
commitd219317074ae8ff1665118988cecb8168ae0085e (patch)
tree89a6b01925b24f83272ec36f0b6a9c378f235d59 /bin/Regions
parentMerge branch 'master' into mantis5110 (diff)
parentConfiguration of persistent baked textures and save/send delays. (diff)
downloadopensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.zip
opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.gz
opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.bz2
opensim-SC-d219317074ae8ff1665118988cecb8168ae0085e.tar.xz
Merge branch 'master' into mantis5110
Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
Diffstat (limited to 'bin/Regions')
0 files changed, 0 insertions, 0 deletions