diff options
| author | Melanie | 2009-09-28 23:03:47 +0100 |
|---|---|---|
| committer | Melanie | 2009-09-28 23:03:47 +0100 |
| commit | 07091493134341a316624d9a1f6a2ef1cfa2f2d8 (patch) | |
| tree | 1d394e128be9766656a441058b2bdf141ba90269 /OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | |
| parent | Allow the notation config_name@port/dll_name:class_name as a handler spec (diff) | |
| parent | Forgot a return statement. (diff) | |
| download | opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.zip opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.gz opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.bz2 opensim-SC-07091493134341a316624d9a1f6a2ef1cfa2f2d8.tar.xz | |
Merge branch 'grid-service-redux'
Diffstat (limited to 'OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs')
| -rw-r--r-- | OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs index e4e12d4..f5126ca 100644 --- a/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs +++ b/OpenSim/Region/Communications/Hypergrid/HGCommunicationsStandalone.cs | |||
| @@ -44,7 +44,6 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 44 | ConfigSettings configSettings, | 44 | ConfigSettings configSettings, |
| 45 | NetworkServersInfo serversInfo, | 45 | NetworkServersInfo serversInfo, |
| 46 | BaseHttpServer httpServer, | 46 | BaseHttpServer httpServer, |
| 47 | HGGridServices gridService, | ||
| 48 | LibraryRootFolder libraryRootFolder, | 47 | LibraryRootFolder libraryRootFolder, |
| 49 | bool dumpAssetsToFile) | 48 | bool dumpAssetsToFile) |
| 50 | : base(serversInfo, libraryRootFolder) | 49 | : base(serversInfo, libraryRootFolder) |
| @@ -64,8 +63,6 @@ namespace OpenSim.Region.Communications.Hypergrid | |||
| 64 | m_avatarService = hgUserService; | 63 | m_avatarService = hgUserService; |
| 65 | m_messageService = hgUserService; | 64 | m_messageService = hgUserService; |
| 66 | 65 | ||
| 67 | gridService.UserProfileCache = m_userProfileCacheService; | ||
| 68 | m_gridService = gridService; | ||
| 69 | } | 66 | } |
| 70 | } | 67 | } |
| 71 | } | 68 | } |