diff options
author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
---|---|---|
committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |
parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
download | opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs index c2b8f26..94e4ed2 100644 --- a/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs +++ b/OpenSim/Region/Communications/OGS1/CommunicationsOGS1.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
40 | : base(serversInfo, libraryRootFolder) | 40 | : base(serversInfo, libraryRootFolder) |
41 | { | 41 | { |
42 | 42 | ||
43 | // This plugin arrangement could eventually be configurable rather than hardcoded here. | 43 | // This plugin arrangement could eventually be configurable rather than hardcoded here. |
44 | OGS1UserServices userServices = new OGS1UserServices(this); | 44 | OGS1UserServices userServices = new OGS1UserServices(this); |
45 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); | 45 | userServices.AddPlugin(new TemporaryUserProfilePlugin()); |
46 | userServices.AddPlugin(new OGS1UserDataPlugin(this)); | 46 | userServices.AddPlugin(new OGS1UserDataPlugin(this)); |