Merge branch 'master' into presence-refactor

This merge was very conflicted. I think I got them all, but I can't be sure. I had to merge to master or risk divergence to the point of unmergeability.
author: Melanie 2010-01-16 00:05:08 +0000
committer: Melanie 2010-01-16 00:05:08 +0000
commit: 10f8c2ea9b67158c32b361f9652d503ea48de292 (patch)
tree: be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent: Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
parent: Add "create user" instructions to README.txt (diff)
download: opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2
opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index f980c24..106e87c 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -65,6 +65,7 @@
        <RegionModule id="LLLoginServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" />    \
        <RegionModule id="SimulationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" />    \
        <RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" />    \
+        <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" />    \
    </Extension>
author	Melanie	2010-01-16 00:05:08 +0000
committer	Melanie	2010-01-16 00:05:08 +0000
commit	10f8c2ea9b67158c32b361f9652d503ea48de292 (patch)
tree	be0d88bc4b6df3825a0d27f62a08170d7c7ad262 /OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
parent	Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
parent	Add "create user" instructions to README.txt (diff)
download	opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.zip opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.gz opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.bz2 opensim-SC-10f8c2ea9b67158c32b361f9652d503ea48de292.tar.xz

diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml index f980c24..106e87c 100644 --- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml +++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -65,6 +65,7 @@
65	<RegionModule id="LLLoginServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" /> \	65	<RegionModule id="LLLoginServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" /> \
66	<RegionModule id="SimulationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" /> \	66	<RegionModule id="SimulationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" /> \
67	<RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" /> \	67	<RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" /> \
		68	<RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" /> \
68		69
69	</Extension>	70	</Extension>
70		71