diff options
| author | teravus | 2012-11-15 09:46:41 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 09:46:41 -0500 |
| commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
| tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Region/RegionCombinerModule/Resources | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz | |
Merge master into teravuswork
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml new file mode 100644 index 0000000..13cb8b6 --- /dev/null +++ b/OpenSim/Region/RegionCombinerModule/Resources/RegionCombinerModule.addin.xml | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | <Addin id="OpenSim.RegionModules.RegionCombinerModule" version="0.3"> | ||
| 2 | <Runtime> | ||
| 3 | <Import assembly="OpenSim.Region.RegionCombinerModule.dll"/> | ||
| 4 | </Runtime> | ||
| 5 | |||
| 6 | <Dependencies> | ||
| 7 | <Addin id="OpenSim" version="0.5" /> | ||
| 8 | </Dependencies> | ||
| 9 | |||
| 10 | <Extension path = "/OpenSim/RegionModules"> | ||
| 11 | <RegionModule id="RegionCombinerModule" type="OpenSim.Region.RegionCombinerModule.RegionCombinerModule" /> | ||
| 12 | </Extension> | ||
| 13 | |||
| 14 | </Addin> | ||