aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/RegionCombinerModule (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge of ubitworkvarnew with opensim/master as of 20150905.Robert Adams2015-09-083-3/+4
| | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1
* Moved RegionCombinerModule to OptionalModules. Removed it as its own ↵Diva Canto2015-09-048-0/+1759
top-level project/dll.