aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
diff options
context:
space:
mode:
authordr scofield (aka dirk husemann)2009-10-01 09:48:02 +0200
committerdr scofield (aka dirk husemann)2009-10-01 09:48:02 +0200
commit9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch)
treea9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
parentadding skeleton test case for LandDataSerializer [w-i-p] (diff)
parentRemoved an innefficent List.Contains lookup from UpdateQueue (diff)
downloadopensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip
opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz
opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2
opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
index f5126ca..4e3f5a1 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs
@@ -41,13 +41,13 @@ namespace OpenSim.Region.Communications.Hypergrid
41 public class HGCommunicationsStandalone : CommunicationsManager 41 public class HGCommunicationsStandalone : CommunicationsManager
42 { 42 {
43 public HGCommunicationsStandalone( 43 public HGCommunicationsStandalone(
44 ConfigSettings configSettings, 44 ConfigSettings configSettings,
45 NetworkServersInfo serversInfo, 45 NetworkServersInfo serversInfo,
46 BaseHttpServer httpServer, 46 BaseHttpServer httpServer,
47 LibraryRootFolder libraryRootFolder, 47 LibraryRootFolder libraryRootFolder,
48 bool dumpAssetsToFile) 48 bool dumpAssetsToFile)
49 : base(serversInfo, libraryRootFolder) 49 : base(serversInfo, libraryRootFolder)
50 { 50 {
51 LocalUserServices localUserService = 51 LocalUserServices localUserService =
52 new LocalUserServices( 52 new LocalUserServices(
53 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this); 53 serversInfo.DefaultHomeLocX, serversInfo.DefaultHomeLocY, this);
@@ -58,8 +58,8 @@ namespace OpenSim.Region.Communications.Hypergrid
58 hgUserService.AddPlugin(new TemporaryUserProfilePlugin()); 58 hgUserService.AddPlugin(new TemporaryUserProfilePlugin());
59 hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService)); 59 hgUserService.AddPlugin(new HGUserDataPlugin(this, hgUserService));
60 60
61 m_userService = hgUserService; 61 m_userService = hgUserService;
62 m_userAdminService = hgUserService; 62 m_userAdminService = hgUserService;
63 m_avatarService = hgUserService; 63 m_avatarService = hgUserService;
64 m_messageService = hgUserService; 64 m_messageService = hgUserService;
65 65