ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 16:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
This commit is contained in:
Melanie
2013-08-17 03:23:45 +01:00
parent df7a1e68f6 85a9cb260a
commit bef03fb30b
28 changed files with 417 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
View File

@@ -98,7 +98,7 @@ namespace OpenSim.Services.Connectors
catch (Exception e)
{
m_log.WarnFormat(
"[NEIGHBOUR SERVICE CONNCTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}. Exception {3}{4}",
"[NEIGHBOUR SERVICES CONNECTOR]: Unable to parse uri {0} to send HelloNeighbour from {1} to {2}. Exception {3}{4}",
uri, thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
return false;
@@ -117,7 +117,7 @@ namespace OpenSim.Services.Connectors
catch (Exception e)
{
m_log.WarnFormat(
"[NEIGHBOUR SERVICE CONNCTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}. Exception {2}{3}",
"[NEIGHBOUR SERVICES CONNECTOR]: PackRegionInfoData failed for HelloNeighbour from {0} to {1}. Exception {2}{3}",
thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
return false;
@@ -137,7 +137,7 @@ namespace OpenSim.Services.Connectors
catch (Exception e)
{
m_log.WarnFormat(
"[NEIGHBOUR SERVICE CONNCTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}. Exception {2}{3}",
"[NEIGHBOUR SERVICES CONNECTOR]: Exception thrown on serialization of HelloNeighbour from {0} to {1}. Exception {2}{3}",
thisRegion.RegionName, region.RegionName, e.Message, e.StackTrace);
return false;
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Connectors
if (webResponse == null)
{
m_log.DebugFormat(
"[REST COMMS]: Null reply on DoHelloNeighbourCall post from {0} to {1}",
"[NEIGHBOUR SERVICES CONNECTOR]: Null reply on DoHelloNeighbourCall post from {0} to {1}",
thisRegion.RegionName, region.RegionName);
}
@@ -193,7 +193,7 @@ namespace OpenSim.Services.Connectors
catch (Exception e)
{
m_log.WarnFormat(
"[NEIGHBOUR SERVICE CONNCTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}. Exception {2}{3}",
"[NEIGHBOUR SERVICES CONNECTOR]: Exception on reply of DoHelloNeighbourCall from {0} back to {1}. Exception {2}{3}",
region.RegionName, thisRegion.RegionName, e.Message, e.StackTrace);
return false;

3
OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs
View File

@@ -56,11 +56,8 @@ namespace OpenSim.Services.Connectors.SimianGrid
private Scene m_scene;
private String m_simianURL;
private IGridUserService m_GridUserService;
#region IRegionModule Members
public string Name
{
get { return this.GetType().Name; }

8
OpenSim/Services/Connectors/SimianGrid/SimianGrid.cs
View File

@@ -29,11 +29,9 @@ using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Reflection;
using log4net;
using Mono.Addins;
using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
@@ -52,7 +50,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private IConfig m_config = null;
private bool m_enabled = true;
private String m_simianURL;
@@ -62,7 +59,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
{
get { return this.GetType().Name; }
}
public void Initialise(IConfigSource config)
{
@@ -76,7 +72,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (String.IsNullOrEmpty(m_simianURL))
{
// m_log.DebugFormat("[SimianGrid] service URL is not defined");
m_enabled = false;
return;
}
@@ -141,6 +136,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
}
#endregion
public static String SimulatorCapability = UUID.Zero.ToString();
public static OSDMap PostToService(string url, NameValueCollection data)
{
@@ -148,4 +144,4 @@ namespace OpenSim.Services.Connectors.SimianGrid
return WebUtil.PostToService(url, data);
}
}
}
}