aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Communications
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/Communications
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC_OLD-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/Communications')
-rw-r--r--OpenSim/Region/Communications/Hypergrid/HGGridServices.cs2
-rw-r--r--OpenSim/Region/Communications/Local/LocalInventoryService.cs2
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1GridServices.cs2
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
index f30b9f7..58711e5 100644
--- a/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
+++ b/OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
@@ -133,7 +133,7 @@ namespace OpenSim.Region.Communications.Hypergrid
133 { 133 {
134 // Region doesn't exist here. Trying to link remote region 134 // Region doesn't exist here. Trying to link remote region
135 135
136 m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort ); 136 m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort);
137 regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random(); 137 regionInfo.RegionID = LinkRegion(regionInfo); // UUID.Random();
138 if (!regionInfo.RegionID.Equals(UUID.Zero)) 138 if (!regionInfo.RegionID.Equals(UUID.Zero))
139 { 139 {
diff --git a/OpenSim/Region/Communications/Local/LocalInventoryService.cs b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
index bb4ee33..3712fb9 100644
--- a/OpenSim/Region/Communications/Local/LocalInventoryService.cs
+++ b/OpenSim/Region/Communications/Local/LocalInventoryService.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Communications.Local
88 } 88 }
89 else 89 else
90 { 90 {
91 m_log.WarnFormat( "[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID); 91 m_log.WarnFormat("[LOCAL INVENTORY SERVICE]: User {0} inventory not available", userID);
92 } 92 }
93 93
94 callback(folders, items); 94 callback(folders, items);
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 7990c9b..f82a6a1 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -435,7 +435,7 @@ namespace OpenSim.Region.Communications.OGS1
435 // string externalUri = (string) responseData["sim_uri"]; 435 // string externalUri = (string) responseData["sim_uri"];
436 436
437 //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port); 437 //IPEndPoint neighbourInternalEndPoint = new IPEndPoint(IPAddress.Parse(internalIpStr), (int) port);
438 regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI ); 438 regionInfo = RegionInfo.Create(regionID, regionName, regX, regY, externalHostName, httpPort, simPort, remotingPort, simURI);
439 439
440 if (m_useRemoteRegionCache) 440 if (m_useRemoteRegionCache)
441 { 441 {