diff options
| author | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
|---|---|---|
| committer | Jonathan Freedman | 2010-10-29 23:12:51 -0400 |
| commit | d219317074ae8ff1665118988cecb8168ae0085e (patch) | |
| tree | 89a6b01925b24f83272ec36f0b6a9c378f235d59 /OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs | |
| parent | Merge branch 'master' into mantis5110 (diff) | |
| parent | Configuration of persistent baked textures and save/send delays. (diff) | |
| download | opensim-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 'OpenSim/Region/OptionalModules/ContentManagementSystem/CMController.cs')
0 files changed, 0 insertions, 0 deletions