OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster 

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
avinationmerge
Melanie 2013-08-01 01:23:24 +01:00
parent bf283208df 9f05a7ac7b
commit 21f5e67030
33 changed files with 1159 additions and 430 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Addons/Groups/GroupsMessagingModule.cs
View File

@ -246,7 +246,7 @@ namespace OpenSim.Groups
public void SendMessageToGroup(GridInstantMessage im, UUID groupID) public void SendMessageToGroup(GridInstantMessage im, UUID groupID)
{ {
UUID fromAgentID = new UUID(im.fromAgentID); UUID fromAgentID = new UUID(im.fromAgentID);
List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", groupID); List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), groupID);
int groupMembersCount = groupMembers.Count; int groupMembersCount = groupMembers.Count;
PresenceInfo[] onlineAgents = null; PresenceInfo[] onlineAgents = null;
@ -297,6 +297,10 @@ namespace OpenSim.Groups
if (member.AgentID.Guid == im.fromAgentID) if (member.AgentID.Guid == im.fromAgentID)
continue; continue;
if (clientsAlreadySent.Contains(member.AgentID))
continue;
clientsAlreadySent.Add(member.AgentID);
if (hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID)) if (hasAgentDroppedGroupChatSession(member.AgentID.ToString(), groupID))
{ {
// Don't deliver messages to people who have dropped this session // Don't deliver messages to people who have dropped this session
@ -336,12 +340,9 @@ namespace OpenSim.Groups
// Deliver locally, directly // Deliver locally, directly
if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name); if (m_debugEnabled) m_log.DebugFormat("[Groups.Messaging]: Passing to ProcessMessageFromGroupSession to deliver to {0} locally", client.Name);
if (clientsAlreadySent.Contains(member.AgentID))
continue;
clientsAlreadySent.Add(member.AgentID);
ProcessMessageFromGroupSession(im); ProcessMessageFromGroupSession(im);
} }
} }
if (m_debugEnabled) if (m_debugEnabled)
@ -403,8 +404,7 @@ namespace OpenSim.Groups
Scene aScene = m_sceneList[0]; Scene aScene = m_sceneList[0];
GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID); GridRegion regionOfOrigin = aScene.GridService.GetRegionByUUID(aScene.RegionInfo.ScopeID, regionID);
List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers("all", GroupID); List<GroupMembersData> groupMembers = m_groupData.GetGroupMembers(UUID.Zero.ToString(), GroupID);
List<UUID> alreadySeen = new List<UUID>();
//if (m_debugEnabled) //if (m_debugEnabled)
// foreach (GroupMembersData m in groupMembers) // foreach (GroupMembersData m in groupMembers)
@ -414,15 +414,10 @@ namespace OpenSim.Groups
{ {
s.ForEachScenePresence(sp => s.ForEachScenePresence(sp =>
{ {
// We need this, because we are searching through all // If we got this via grid messaging, it's because the caller thinks
// SPs, both root and children // that the root agent is here. We should only send the IM to root agents.
if (alreadySeen.Contains(sp.UUID)) if (sp.IsChildAgent)
{
if (m_debugEnabled)
m_log.DebugFormat("[Groups.Messaging]: skipping agent {0} because we've already seen it", sp.UUID);
return; return;
}
alreadySeen.Add(sp.UUID);
GroupMembersData m = groupMembers.Find(gmd => GroupMembersData m = groupMembers.Find(gmd =>
{ {

4
OpenSim/Addons/Groups/GroupsModule.cs
View File

@ -991,6 +991,10 @@ namespace OpenSim.Groups
// Should this send updates to everyone in the group? // Should this send updates to everyone in the group?
SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient)); SendAgentGroupDataUpdate(remoteClient, GetRequestingAgentID(remoteClient));
if (reason != string.Empty)
// A warning
remoteClient.SendAlertMessage("Warning: " + reason);
} }
else else
remoteClient.SendJoinGroupReply(groupID, false); remoteClient.SendJoinGroupReply(groupID, false);

15
OpenSim/Addons/Groups/Hypergrid/GroupsServiceHGConnectorModule.cs
View File

@ -254,7 +254,10 @@ namespace OpenSim.Groups
{ {
string url = string.Empty, gname = string.Empty; string url = string.Empty, gname = string.Empty;
if (IsLocal(GroupID, out url, out gname)) if (IsLocal(GroupID, out url, out gname))
return m_LocalGroupsConnector.GetGroupMembers(AgentUUI(RequestingAgentID), GroupID); {
string agentID = AgentUUI(RequestingAgentID);
return m_LocalGroupsConnector.GetGroupMembers(agentID, GroupID);
}
else if (!string.IsNullOrEmpty(url)) else if (!string.IsNullOrEmpty(url))
{ {
ExtendedGroupMembershipData membership = m_LocalGroupsConnector.GetAgentGroupMembership(RequestingAgentID, RequestingAgentID, GroupID); ExtendedGroupMembershipData membership = m_LocalGroupsConnector.GetAgentGroupMembership(RequestingAgentID, RequestingAgentID, GroupID);
@ -396,17 +399,21 @@ namespace OpenSim.Groups
if (success) if (success)
{ {
// Here we always return true. The user has been added to the local group,
// independent of whether the remote operation succeeds or not
url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI"); url = m_UserManagement.GetUserServerURL(uid, "GroupsServerURI");
if (url == string.Empty) if (url == string.Empty)
{ {
reason = "User doesn't have a groups server"; reason = "You don't have have an accessible groups server in your home world. You membership to this group in only within this grid.";
return false; return true;
} }
GroupsServiceHGConnector c = GetConnector(url); GroupsServiceHGConnector c = GetConnector(url);
if (c != null) if (c != null)
return c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason); c.CreateProxy(AgentUUI(RequestingAgentID), AgentID, token, GroupID, m_LocalGroupsServiceLocation, name, out reason);
return true;
} }
return false;
} }
} }
else if (m_UserManagement.IsLocalGridUser(uid)) // local user else if (m_UserManagement.IsLocalGridUser(uid)) // local user

1
OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnector.cs
View File

@ -256,6 +256,7 @@ namespace OpenSim.Groups
Dictionary<string, object> sendData = new Dictionary<string, object>(); Dictionary<string, object> sendData = new Dictionary<string, object>();
sendData["GroupID"] = GroupID.ToString(); sendData["GroupID"] = GroupID.ToString();
sendData["RequestingAgentID"] = RequestingAgentID; sendData["RequestingAgentID"] = RequestingAgentID;
Dictionary<string, object> ret = MakeRequest("GETGROUPMEMBERS", sendData); Dictionary<string, object> ret = MakeRequest("GETGROUPMEMBERS", sendData);
if (ret == null) if (ret == null)

4
OpenSim/Addons/Groups/Service/GroupsService.cs
View File

@ -257,8 +257,8 @@ namespace OpenSim.Groups
// Check visibility? // Check visibility?
// When we don't want to check visibility, we pass it "all" as the requestingAgentID // When we don't want to check visibility, we pass it "all" as the requestingAgentID
bool checkVisibility = !RequestingAgentID.Equals("all"); bool checkVisibility = !RequestingAgentID.Equals(UUID.Zero.ToString());
m_log.DebugFormat("[ZZZ]: AgentID is {0}. checkVisibility is {1}", RequestingAgentID, checkVisibility);
if (checkVisibility) if (checkVisibility)
{ {
// Is the requester a member of the group? // Is the requester a member of the group?

25
OpenSim/Framework/Monitoring/SimExtraStatsCollector.cs
View File

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq;
using System.Text; using System.Text;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
@ -39,8 +40,6 @@ namespace OpenSim.Framework.Monitoring
/// </summary> /// </summary>
public class SimExtraStatsCollector : BaseStatsCollector public class SimExtraStatsCollector : BaseStatsCollector
{ {
private long abnormalClientThreadTerminations;
// private long assetsInCache; // private long assetsInCache;
// private long texturesInCache; // private long texturesInCache;
// private long assetCacheMemoryUsage; // private long assetCacheMemoryUsage;
@ -73,11 +72,6 @@ namespace OpenSim.Framework.Monitoring
private volatile float activeScripts; private volatile float activeScripts;
private volatile float scriptLinesPerSecond; private volatile float scriptLinesPerSecond;
/// <summary>
/// Number of times that a client thread terminated because of an exception
/// </summary>
public long AbnormalClientThreadTerminations { get { return abnormalClientThreadTerminations; } }
// /// <summary> // /// <summary>
// /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the // /// These statistics are being collected by push rather than pull. Pull would be simpler, but I had the
// /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these // /// notion of providing some flow statistics (which pull wouldn't give us). Though admittedly these
@ -166,11 +160,6 @@ namespace OpenSim.Framework.Monitoring
private IDictionary<UUID, PacketQueueStatsCollector> packetQueueStatsCollectors private IDictionary<UUID, PacketQueueStatsCollector> packetQueueStatsCollectors
= new Dictionary<UUID, PacketQueueStatsCollector>(); = new Dictionary<UUID, PacketQueueStatsCollector>();
public void AddAbnormalClientThreadTermination()
{
abnormalClientThreadTerminations++;
}
// public void AddAsset(AssetBase asset) // public void AddAsset(AssetBase asset)
// { // {
// assetsInCache++; // assetsInCache++;
@ -324,10 +313,12 @@ Asset service request failures: {3}" + Environment.NewLine,
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
sb.Append("CONNECTION STATISTICS"); sb.Append("CONNECTION STATISTICS");
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
sb.Append(
string.Format( List<Stat> stats = StatsManager.GetStatsFromEachContainer("clientstack", "ClientLogoutsDueToNoReceives");
"Abnormal client thread terminations: {0}" + Environment.NewLine,
abnormalClientThreadTerminations)); sb.AppendFormat(
"Client logouts due to no data receive timeout: {0}\n\n",
stats != null ? stats.Sum(s => s.Value).ToString() : "unknown");
// sb.Append(Environment.NewLine); // sb.Append(Environment.NewLine);
// sb.Append("INVENTORY STATISTICS"); // sb.Append("INVENTORY STATISTICS");
@ -338,7 +329,7 @@ Asset service request failures: {3}" + Environment.NewLine,
// InventoryServiceRetrievalFailures)); // InventoryServiceRetrievalFailures));
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
sb.Append("FRAME STATISTICS"); sb.Append("SAMPLE FRAME STATISTICS");
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);
sb.Append("Dilatn SimFPS PhyFPS AgntUp RootAg ChldAg Prims AtvPrm AtvScr ScrLPS"); sb.Append("Dilatn SimFPS PhyFPS AgntUp RootAg ChldAg Prims AtvPrm AtvScr ScrLPS");
sb.Append(Environment.NewLine); sb.Append(Environment.NewLine);

65
OpenSim/Framework/Monitoring/StatsManager.cs
View File

@ -271,7 +271,7 @@ namespace OpenSim.Framework.Monitoring
// Stat name is not unique across category/container/shortname key. // Stat name is not unique across category/container/shortname key.
// XXX: For now just return false. This is to avoid problems in regression tests where all tests // XXX: For now just return false. This is to avoid problems in regression tests where all tests
// in a class are run in the same instance of the VM. // in a class are run in the same instance of the VM.
if (TryGetStat(stat, out category, out container)) if (TryGetStatParents(stat, out category, out container))
return false; return false;
// We take a copy-on-write approach here of replacing dictionaries when keys are added or removed. // We take a copy-on-write approach here of replacing dictionaries when keys are added or removed.
@ -307,7 +307,7 @@ namespace OpenSim.Framework.Monitoring
lock (RegisteredStats) lock (RegisteredStats)
{ {
if (!TryGetStat(stat, out category, out container)) if (!TryGetStatParents(stat, out category, out container))
return false; return false;
newContainer = new SortedDictionary<string, Stat>(container); newContainer = new SortedDictionary<string, Stat>(container);
@ -323,12 +323,67 @@ namespace OpenSim.Framework.Monitoring
} }
} }
public static bool TryGetStats(string category, out SortedDictionary<string, SortedDictionary<string, Stat>> stats) public static bool TryGetStat(string category, string container, string statShortName, out Stat stat)
{ {
return RegisteredStats.TryGetValue(category, out stats); stat = null;
SortedDictionary<string, SortedDictionary<string, Stat>> categoryStats;
lock (RegisteredStats)
{
if (!TryGetStatsForCategory(category, out categoryStats))
return false;
SortedDictionary<string, Stat> containerStats;
if (!categoryStats.TryGetValue(container, out containerStats))
return false;
return containerStats.TryGetValue(statShortName, out stat);
}
} }
public static bool TryGetStat( public static bool TryGetStatsForCategory(
string category, out SortedDictionary<string, SortedDictionary<string, Stat>> stats)
{
lock (RegisteredStats)
return RegisteredStats.TryGetValue(category, out stats);
}
/// <summary>
/// Get the same stat for each container in a given category.
/// </summary>
/// <returns>
/// The stats if there were any to fetch. Otherwise null.
/// </returns>
/// <param name='category'></param>
/// <param name='statShortName'></param>
public static List<Stat> GetStatsFromEachContainer(string category, string statShortName)
{
SortedDictionary<string, SortedDictionary<string, Stat>> categoryStats;
lock (RegisteredStats)
{
if (!RegisteredStats.TryGetValue(category, out categoryStats))
return null;
List<Stat> stats = null;
foreach (SortedDictionary<string, Stat> containerStats in categoryStats.Values)
{
if (containerStats.ContainsKey(statShortName))
{
if (stats == null)
stats = new List<Stat>();
stats.Add(containerStats[statShortName]);
}
}
return stats;
}
}
public static bool TryGetStatParents(
Stat stat, Stat stat,
out SortedDictionary<string, SortedDictionary<string, Stat>> category, out SortedDictionary<string, SortedDictionary<string, Stat>> category,
out SortedDictionary<string, Stat> container) out SortedDictionary<string, Stat> container)

25
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
View File

@ -82,6 +82,8 @@ namespace OpenSim.Region.ClientStack.Linden
private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>(); private Dictionary<UUID,PollServiceTextureEventArgs> m_pollservices = new Dictionary<UUID,PollServiceTextureEventArgs>();
private string m_URL;
#region ISharedRegionModule Members #region ISharedRegionModule Members
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
@ -343,13 +345,13 @@ namespace OpenSim.Region.ClientStack.Linden
private void RegisterCaps(UUID agentID, Caps caps) private void RegisterCaps(UUID agentID, Caps caps)
{ {
string capUrl = "/CAPS/" + UUID.Random() + "/"; m_URL = "/CAPS/" + UUID.Random() + "/";
// Register this as a poll service // Register this as a poll service
PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene); PollServiceTextureEventArgs args = new PollServiceTextureEventArgs(agentID, m_scene);
args.Type = PollServiceEventArgs.EventType.Texture; args.Type = PollServiceEventArgs.EventType.Texture;
MainServer.Instance.AddPollServiceHTTPHandler(capUrl, args); MainServer.Instance.AddPollServiceHTTPHandler(m_URL, args);
string hostName = m_scene.RegionInfo.ExternalHostName; string hostName = m_scene.RegionInfo.ExternalHostName;
uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port; uint port = (MainServer.Instance == null) ? 0 : MainServer.Instance.Port;
@ -361,20 +363,23 @@ namespace OpenSim.Region.ClientStack.Linden
port = MainServer.Instance.SSLPort; port = MainServer.Instance.SSLPort;
protocol = "https"; protocol = "https";
} }
caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, capUrl));
IExternalCapsModule handler = m_scene.RequestModuleInterface<IExternalCapsModule>();
if (handler != null)
handler.RegisterExternalUserCapsHandler(agentID, caps, "GetTexture", m_URL);
else
caps.RegisterHandler("GetTexture", String.Format("{0}://{1}:{2}{3}", protocol, hostName, port, m_URL));
m_pollservices[agentID] = args; m_pollservices[agentID] = args;
m_capsDict[agentID] = capUrl; m_capsDict[agentID] = m_URL;
} }
private void DeregisterCaps(UUID agentID, Caps caps) private void DeregisterCaps(UUID agentID, Caps caps)
{ {
string capUrl;
PollServiceTextureEventArgs args; PollServiceTextureEventArgs args;
if (m_capsDict.TryGetValue(agentID, out capUrl))
{ MainServer.Instance.RemoveHTTPHandler("", m_URL);
MainServer.Instance.RemoveHTTPHandler("", capUrl); m_capsDict.Remove(agentID);
m_capsDict.Remove(agentID);
}
if (m_pollservices.TryGetValue(agentID, out args)) if (m_pollservices.TryGetValue(agentID, out args))
{ {
m_pollservices.Remove(agentID); m_pollservices.Remove(agentID);

26
OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
View File

@ -68,7 +68,6 @@ namespace OpenSim.Region.ClientStack.Linden
/// </summary> /// </summary>
private OSDMap m_features = new OSDMap(); private OSDMap m_features = new OSDMap();
private string m_MapImageServerURL = string.Empty;
private string m_SearchURL = string.Empty; private string m_SearchURL = string.Empty;
private bool m_ExportSupported = false; private bool m_ExportSupported = false;
@ -78,15 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
IConfig config = source.Configs["SimulatorFeatures"]; IConfig config = source.Configs["SimulatorFeatures"];
if (config != null) if (config != null)
{ {
m_MapImageServerURL = config.GetString("MapImageServerURI", string.Empty);
if (m_MapImageServerURL != string.Empty)
{
m_MapImageServerURL = m_MapImageServerURL.Trim();
if (!m_MapImageServerURL.EndsWith("/"))
m_MapImageServerURL = m_MapImageServerURL + "/";
}
m_SearchURL = config.GetString("SearchServerURI", string.Empty); m_SearchURL = config.GetString("SearchServerURI", string.Empty);
m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported); m_ExportSupported = config.GetBoolean("ExportSupported", m_ExportSupported);
@ -149,15 +140,16 @@ namespace OpenSim.Region.ClientStack.Linden
m_features["PhysicsShapeTypes"] = typesMap; m_features["PhysicsShapeTypes"] = typesMap;
// Extra information for viewers that want to use it // Extra information for viewers that want to use it
OSDMap gridServicesMap = new OSDMap(); // TODO: Take these out of here into their respective modules, like map-server-url
if (m_MapImageServerURL != string.Empty) OSDMap extrasMap = new OSDMap();
gridServicesMap["map-server-url"] = m_MapImageServerURL;
if (m_SearchURL != string.Empty) if (m_SearchURL != string.Empty)
gridServicesMap["search"] = m_SearchURL; extrasMap["search-server-url"] = m_SearchURL;
m_features["GridServices"] = gridServicesMap;
if (m_ExportSupported) if (m_ExportSupported)
m_features["ExportSupported"] = true; extrasMap["ExportSupported"] = true;
if (extrasMap.Count > 0)
m_features["OpenSimExtras"] = extrasMap;
} }
} }

39
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -67,11 +67,24 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
m_udpServer.AddScene(scene); m_udpServer.AddScene(scene);
StatsManager.RegisterStat(
new Stat(
"ClientLogoutsDueToNoReceives",
"Number of times a client has been logged out because no packets were received before the timeout.",
"",
"",
"clientstack",
scene.Name,
StatType.Pull,
MeasuresOfInterest.None,
stat => stat.Value = m_udpServer.ClientLogoutsDueToNoReceives,
StatVerbosity.Debug));
StatsManager.RegisterStat( StatsManager.RegisterStat(
new Stat( new Stat(
"IncomingUDPReceivesCount", "IncomingUDPReceivesCount",
"Number of UDP receives performed", "Number of UDP receives performed",
"Number of UDP receives performed", "",
"", "",
"clientstack", "clientstack",
scene.Name, scene.Name,
@ -84,7 +97,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
new Stat( new Stat(
"IncomingPacketsProcessedCount", "IncomingPacketsProcessedCount",
"Number of inbound LL protocol packets processed", "Number of inbound LL protocol packets processed",
"Number of inbound LL protocol packets processed", "",
"", "",
"clientstack", "clientstack",
scene.Name, scene.Name,
@ -97,7 +110,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
new Stat( new Stat(
"OutgoingUDPSendsCount", "OutgoingUDPSendsCount",
"Number of UDP sends performed", "Number of UDP sends performed",
"Number of UDP sends performed", "",
"", "",
"clientstack", "clientstack",
scene.Name, scene.Name,
@ -149,6 +162,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary> /// <summary>Maximum transmission unit, or UDP packet size, for the LLUDP protocol</summary>
public const int MTU = 1400; public const int MTU = 1400;
/// <summary>Number of forced client logouts due to no receipt of packets before timeout.</summary>
public int ClientLogoutsDueToNoReceives { get; private set; }
/// <summary> /// <summary>
/// Default packet debug level given to new clients /// Default packet debug level given to new clients
/// </summary> /// </summary>
@ -1058,7 +1074,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Fire this out on a different thread so that we don't hold up outgoing packet processing for // Fire this out on a different thread so that we don't hold up outgoing packet processing for
// everybody else if this is being called due to an ack timeout. // everybody else if this is being called due to an ack timeout.
// This is the same as processing as the async process of a logout request. // This is the same as processing as the async process of a logout request.
Util.FireAndForget(o => DeactivateClientDueToTimeout(client)); Util.FireAndForget(o => DeactivateClientDueToTimeout(client, timeoutTicks));
return; return;
} }
@ -1842,18 +1858,19 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// regular client pings. /// regular client pings.
/// </remarks> /// </remarks>
/// <param name='client'></param> /// <param name='client'></param>
private void DeactivateClientDueToTimeout(LLClientView client) /// <param name='timeoutTicks'></param>
private void DeactivateClientDueToTimeout(LLClientView client, int timeoutTicks)
{ {
lock (client.CloseSyncLock) lock (client.CloseSyncLock)
{ {
ClientLogoutsDueToNoReceives++;
m_log.WarnFormat( m_log.WarnFormat(
"[LLUDPSERVER]: Ack timeout, disconnecting {0} agent for {1} in {2}", "[LLUDPSERVER]: No packets received from {0} agent of {1} for {2}ms in {3}. Disconnecting.",
client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, m_scene.RegionInfo.RegionName); client.SceneAgent.IsChildAgent ? "child" : "root", client.Name, timeoutTicks, m_scene.Name);
StatsManager.SimExtraStats.AddAbnormalClientThreadTermination();
if (!client.SceneAgent.IsChildAgent) if (!client.SceneAgent.IsChildAgent)
client.Kick("Simulator logged you out due to connection timeout"); client.Kick("Simulator logged you out due to connection timeout.");
client.CloseWithoutChecks(true); client.CloseWithoutChecks(true);
} }

64
OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
View File

@ -31,6 +31,7 @@ using System.Reflection;
using log4net; using log4net;
using Nini.Config; using Nini.Config;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData;
using Mono.Addins; using Mono.Addins;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.CoreModules.World.WorldMap; using OpenSim.Region.CoreModules.World.WorldMap;
@ -48,20 +49,63 @@ namespace OpenSim.Region.CoreModules.Hypergrid
// Remember the map area that each client has been exposed to in this region // Remember the map area that each client has been exposed to in this region
private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>(); private Dictionary<UUID, List<MapBlockData>> m_SeenMapBlocks = new Dictionary<UUID, List<MapBlockData>>();
private string m_MapImageServerURL = string.Empty;
private IUserManagement m_UserManagement;
#region INonSharedRegionModule Members #region INonSharedRegionModule Members
public override void Initialise(IConfigSource config) public override void Initialise(IConfigSource source)
{ {
if (Util.GetConfigVarFromSections<string>( if (Util.GetConfigVarFromSections<string>(
config, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap") source, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
{
m_Enabled = true; m_Enabled = true;
m_MapImageServerURL = Util.GetConfigVarFromSections<string>(source, "MapTileURL", new string[] {"LoginService", "HGWorldMap", "SimulatorFeatures"});
if (!string.IsNullOrEmpty(m_MapImageServerURL))
{
m_MapImageServerURL = m_MapImageServerURL.Trim();
if (!m_MapImageServerURL.EndsWith("/"))
m_MapImageServerURL = m_MapImageServerURL + "/";
}
}
} }
public override void AddRegion(Scene scene) public override void AddRegion(Scene scene)
{ {
if (!m_Enabled)
return;
base.AddRegion(scene); base.AddRegion(scene);
scene.EventManager.OnClientClosed += new EventManager.ClientClosed(EventManager_OnClientClosed); scene.EventManager.OnClientClosed += EventManager_OnClientClosed;
}
public override void RegionLoaded(Scene scene)
{
if (!m_Enabled)
return;
base.RegionLoaded(scene);
ISimulatorFeaturesModule featuresModule = m_scene.RequestModuleInterface<ISimulatorFeaturesModule>();
if (featuresModule != null)
featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest;
m_UserManagement = m_scene.RequestModuleInterface<IUserManagement>();
}
public override void RemoveRegion(Scene scene)
{
if (!m_Enabled)
return;
scene.EventManager.OnClientClosed -= EventManager_OnClientClosed;
} }
public override string Name public override string Name
@ -115,6 +159,20 @@ namespace OpenSim.Region.CoreModules.Hypergrid
return mapBlocks; return mapBlocks;
} }
private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
{
if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
{
OSD extras = new OSDMap();
if (features.ContainsKey("OpenSimExtras"))
extras = features["OpenSimExtras"];
else
features["OpenSimExtras"] = extras;
((OSDMap)extras)["map-server-url"] = m_MapImageServerURL;
}
}
} }
class MapArea class MapArea

48
OpenSim/Region/Framework/Interfaces/IExternalCapsModule.cs Normal file
View File

@ -0,0 +1,48 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using OpenMetaverse;
using OpenSim.Framework;
using Caps=OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Region.Framework.Interfaces
{
public interface IExternalCapsModule
{
/// <summary>
/// This function extends the simple URL configuration in the caps handlers
/// to facilitate more interesting computation when an external handler is
/// sent to the viewer.
/// </summary>
/// <param name="agentID">New user UUID</param>
/// <param name="caps">Internal caps registry, where the external handler will be registered</param>
/// <param name="capName">Name of the specific cap we are registering</param>
/// <param name="urlSkel">The skeleton URL provided in the caps configuration</param>
bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel);
}
}

54
OpenSim/Region/OptionalModules/Scripting/ExtendedPhysics/ExtendedPhysics.cs
View File

@ -31,10 +31,10 @@ using System.Reflection;
using System.Text; using System.Text;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Region.CoreModules;
using OpenSim.Region.Framework; using OpenSim.Region.Framework;
using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes;
using OpenSim.Region.CoreModules;
using Mono.Addins; using Mono.Addins;
using Nini.Config; using Nini.Config;
@ -49,6 +49,10 @@ public class ExtendedPhysics : INonSharedRegionModule
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private static string LogHeader = "[EXTENDED PHYSICS]"; private static string LogHeader = "[EXTENDED PHYSICS]";
// Since BulletSim is a plugin, this these values aren't defined easily in one place.
// This table must coorespond to an identical table in BSScene.
public const string PhysFunctSetLinksetType = "BulletSim.SetLinksetType";
private IConfig Configuration { get; set; } private IConfig Configuration { get; set; }
private bool Enabled { get; set; } private bool Enabled { get; set; }
private Scene BaseScene { get; set; } private Scene BaseScene { get; set; }
@ -143,13 +147,6 @@ public class ExtendedPhysics : INonSharedRegionModule
[ScriptConstant] [ScriptConstant]
public static int PHYS_CENTER_OF_MASS = 1 << 0; public static int PHYS_CENTER_OF_MASS = 1 << 0;
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_CONSTRAINT = 1;
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_COMPOUND = 2;
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_MANUAL = 3;
[ScriptInvocation] [ScriptInvocation]
public string physGetEngineType(UUID hostID, UUID scriptID) public string physGetEngineType(UUID hostID, UUID scriptID)
{ {
@ -163,9 +160,50 @@ public class ExtendedPhysics : INonSharedRegionModule
return ret; return ret;
} }
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_CONSTRAINT = 0;
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_COMPOUND = 1;
[ScriptConstant]
public static int PHYS_LINKSET_TYPE_MANUAL = 2;
[ScriptInvocation] [ScriptInvocation]
public void physSetLinksetType(UUID hostID, UUID scriptID, int linksetType) public void physSetLinksetType(UUID hostID, UUID scriptID, int linksetType)
{ {
if (!Enabled) return;
// The part that is requesting the change.
SceneObjectPart requestingPart = BaseScene.GetSceneObjectPart(hostID);
if (requestingPart != null)
{
// The change is always made to the root of a linkset.
SceneObjectGroup containingGroup = requestingPart.ParentGroup;
SceneObjectPart rootPart = containingGroup.RootPart;
if (rootPart != null)
{
Physics.Manager.PhysicsActor rootPhysActor = rootPart.PhysActor;
if (rootPhysActor != null)
{
rootPhysActor.Extension(PhysFunctSetLinksetType, linksetType);
}
else
{
m_log.WarnFormat("{0} physSetLinksetType: root part does not have a physics actor. rootName={1}, hostID={2}",
LogHeader, rootPart.Name, hostID);
}
}
else
{
m_log.WarnFormat("{0} physSetLinksetType: root part does not exist. RequestingPartName={1}, hostID={2}",
LogHeader, requestingPart.Name, hostID);
}
}
else
{
m_log.WarnFormat("{0} physSetLinsetType: cannot find script object in scene. hostID={1}", LogHeader, hostID);
}
} }
} }
} }

2
OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
View File

@ -75,7 +75,7 @@ public sealed class BSCharacter : BSPhysObject
RawVelocity = OMV.Vector3.Zero; RawVelocity = OMV.Vector3.Zero;
_buoyancy = ComputeBuoyancyFromFlying(isFlying); _buoyancy = ComputeBuoyancyFromFlying(isFlying);
Friction = BSParam.AvatarStandingFriction; Friction = BSParam.AvatarStandingFriction;
Density = BSParam.AvatarDensity / BSParam.DensityScaleFactor; Density = BSParam.AvatarDensity;
// Old versions of ScenePresence passed only the height. If width and/or depth are zero, // Old versions of ScenePresence passed only the height. If width and/or depth are zero,
// replace with the default values. // replace with the default values.

75
OpenSim/Region/Physics/BulletSPlugin/BSDynamics.cs
View File

@ -589,10 +589,10 @@ namespace OpenSim.Region.Physics.BulletSPlugin
m_vehicleMass = ControllingPrim.TotalMass; m_vehicleMass = ControllingPrim.TotalMass;
// Friction affects are handled by this vehicle code // Friction affects are handled by this vehicle code
m_physicsScene.PE.SetFriction(ControllingPrim.PhysBody, BSParam.VehicleFriction); // m_physicsScene.PE.SetFriction(ControllingPrim.PhysBody, BSParam.VehicleFriction);
m_physicsScene.PE.SetRestitution(ControllingPrim.PhysBody, BSParam.VehicleRestitution); // m_physicsScene.PE.SetRestitution(ControllingPrim.PhysBody, BSParam.VehicleRestitution);
// ControllingPrim.Linkset.SetPhysicalFriction(BSParam.VehicleFriction); ControllingPrim.Linkset.SetPhysicalFriction(BSParam.VehicleFriction);
// ControllingPrim.Linkset.SetPhysicalRestitution(BSParam.VehicleRestitution); ControllingPrim.Linkset.SetPhysicalRestitution(BSParam.VehicleRestitution);
// Moderate angular movement introduced by Bullet. // Moderate angular movement introduced by Bullet.
// TODO: possibly set AngularFactor and LinearFactor for the type of vehicle. // TODO: possibly set AngularFactor and LinearFactor for the type of vehicle.
@ -602,21 +602,21 @@ namespace OpenSim.Region.Physics.BulletSPlugin
m_physicsScene.PE.SetAngularFactorV(ControllingPrim.PhysBody, BSParam.VehicleAngularFactor); m_physicsScene.PE.SetAngularFactorV(ControllingPrim.PhysBody, BSParam.VehicleAngularFactor);
// Vehicles report collision events so we know when it's on the ground // Vehicles report collision events so we know when it's on the ground
m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS); // m_physicsScene.PE.AddToCollisionFlags(ControllingPrim.PhysBody, CollisionFlags.BS_VEHICLE_COLLISIONS);
// ControllingPrim.Linkset.SetPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS); ControllingPrim.Linkset.AddToPhysicalCollisionFlags(CollisionFlags.BS_VEHICLE_COLLISIONS);
Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass); // Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(ControllingPrim.PhysShape.physShapeInfo, m_vehicleMass);
ControllingPrim.Inertia = inertia * BSParam.VehicleInertiaFactor; // ControllingPrim.Inertia = inertia * BSParam.VehicleInertiaFactor;
m_physicsScene.PE.SetMassProps(ControllingPrim.PhysBody, m_vehicleMass, ControllingPrim.Inertia); // m_physicsScene.PE.SetMassProps(ControllingPrim.PhysBody, m_vehicleMass, ControllingPrim.Inertia);
m_physicsScene.PE.UpdateInertiaTensor(ControllingPrim.PhysBody); // m_physicsScene.PE.UpdateInertiaTensor(ControllingPrim.PhysBody);
// ControllingPrim.Linkset.ComputeLocalInertia(BSParam.VehicleInertiaFactor); ControllingPrim.Linkset.ComputeAndSetLocalInertia(BSParam.VehicleInertiaFactor, m_vehicleMass);
// Set the gravity for the vehicle depending on the buoyancy // Set the gravity for the vehicle depending on the buoyancy
// TODO: what should be done if prim and vehicle buoyancy differ? // TODO: what should be done if prim and vehicle buoyancy differ?
m_VehicleGravity = ControllingPrim.ComputeGravity(m_VehicleBuoyancy); m_VehicleGravity = ControllingPrim.ComputeGravity(m_VehicleBuoyancy);
// The actual vehicle gravity is set to zero in Bullet so we can do all the application of same. // The actual vehicle gravity is set to zero in Bullet so we can do all the application of same.
m_physicsScene.PE.SetGravity(ControllingPrim.PhysBody, Vector3.Zero); // m_physicsScene.PE.SetGravity(ControllingPrim.PhysBody, Vector3.Zero);
// ControllingPrim.Linkset.SetPhysicalGravity(Vector3.Zero); ControllingPrim.Linkset.SetPhysicalGravity(Vector3.Zero);
VDetailLog("{0},BSDynamics.SetPhysicalParameters,mass={1},inert={2},vehGrav={3},aDamp={4},frict={5},rest={6},lFact={7},aFact={8}", VDetailLog("{0},BSDynamics.SetPhysicalParameters,mass={1},inert={2},vehGrav={3},aDamp={4},frict={5},rest={6},lFact={7},aFact={8}",
ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity, ControllingPrim.LocalID, m_vehicleMass, ControllingPrim.Inertia, m_VehicleGravity,
@ -1121,7 +1121,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
{ {
m_VhoverTargetHeight = m_VhoverHeight; m_VhoverTargetHeight = m_VhoverHeight;
} }
if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0) if ((m_flags & VehicleFlag.HOVER_UP_ONLY) != 0)
{ {
// If body is already heigher, use its height as target height // If body is already heigher, use its height as target height
@ -1170,7 +1169,6 @@ namespace OpenSim.Region.Physics.BulletSPlugin
m_VhoverTimescale, m_VhoverHeight, m_VhoverTargetHeight, m_VhoverTimescale, m_VhoverHeight, m_VhoverTargetHeight,
verticalError, verticalCorrection); verticalError, verticalCorrection);
} }
} }
} }
@ -1357,6 +1355,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
private void ComputeAngularTurning(float pTimestep) private void ComputeAngularTurning(float pTimestep)
{ {
// The user wants this many radians per second angular change? // The user wants this many radians per second angular change?
Vector3 origVehicleRotationalVelocity = VehicleRotationalVelocity; // DEBUG DEBUG
Vector3 currentAngularV = VehicleRotationalVelocity * Quaternion.Inverse(VehicleOrientation); Vector3 currentAngularV = VehicleRotationalVelocity * Quaternion.Inverse(VehicleOrientation);
Vector3 angularMotorContributionV = m_angularMotor.Step(pTimestep, currentAngularV); Vector3 angularMotorContributionV = m_angularMotor.Step(pTimestep, currentAngularV);
@ -1369,20 +1368,20 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// TODO: This is here because this is where ODE put it but documentation says it // TODO: This is here because this is where ODE put it but documentation says it
// is a linear effect. Where should this check go? // is a linear effect. Where should this check go?
//if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0) //if ((m_flags & (VehicleFlag.NO_DEFLECTION_UP)) != 0)
// { // {
// angularMotorContributionV.X = 0f; // angularMotorContributionV.X = 0f;
// angularMotorContributionV.Y = 0f; // angularMotorContributionV.Y = 0f;
// } // }
// Reduce any velocity by friction. // Reduce any velocity by friction.
Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep); Vector3 frictionFactorW = ComputeFrictionFactor(m_angularFrictionTimescale, pTimestep);
angularMotorContributionV -= (currentAngularV * frictionFactorW); angularMotorContributionV -= (currentAngularV * frictionFactorW);
VehicleRotationalVelocity += angularMotorContributionV * VehicleOrientation; Vector3 angularMotorContributionW = angularMotorContributionV * VehicleOrientation;
VehicleRotationalVelocity += angularMotorContributionW;
VDetailLog("{0}, MoveAngular,angularTurning,curAngVelV={1},origVehRotVel={2},vehRotVel={3},frictFact={4}, angContribV={5},angContribW={6}",
ControllingPrim.LocalID, currentAngularV, origVehicleRotationalVelocity, VehicleRotationalVelocity, frictionFactorW, angularMotorContributionV, angularMotorContributionW);
VDetailLog("{0}, MoveAngular,angularTurning,angContribV={1}", ControllingPrim.LocalID, angularMotorContributionV);
} }
// From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial: // From http://wiki.secondlife.com/wiki/Linden_Vehicle_Tutorial:
@ -1409,7 +1408,7 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// Flipping what was originally a timescale into a speed variable and then multiplying it by 2 // Flipping what was originally a timescale into a speed variable and then multiplying it by 2
// since only computing half the distance between the angles. // since only computing half the distance between the angles.
float VerticalAttractionSpeed = (1 / m_verticalAttractionTimescale) * 2.0f; float verticalAttractionSpeed = (1 / m_verticalAttractionTimescale) * 2.0f;
// Make a prediction of where the up axis will be when this is applied rather then where it is now as // Make a prediction of where the up axis will be when this is applied rather then where it is now as
// this makes for a smoother adjustment and less fighting between the various forces. // this makes for a smoother adjustment and less fighting between the various forces.
@ -1419,12 +1418,13 @@ namespace OpenSim.Region.Physics.BulletSPlugin
Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ); Vector3 torqueVector = Vector3.Cross(predictedUp, Vector3.UnitZ);
// Scale vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared // Scale vector by our timescale since it is an acceleration it is r/s^2 or radians a timescale squared
Vector3 vertContributionV = torqueVector * VerticalAttractionSpeed * VerticalAttractionSpeed; Vector3 vertContributionV = torqueVector * verticalAttractionSpeed * verticalAttractionSpeed;
VehicleRotationalVelocity += vertContributionV; VehicleRotationalVelocity += vertContributionV;
VDetailLog("{0}, MoveAngular,verticalAttraction,upAxis={1},PredictedUp={2},torqueVector={3},contrib={4}", VDetailLog("{0}, MoveAngular,verticalAttraction,vertAttrSpeed={1},upAxis={2},PredictedUp={3},torqueVector={4},contrib={5}",
ControllingPrim.LocalID, ControllingPrim.LocalID,
verticalAttractionSpeed,
vehicleUpAxis, vehicleUpAxis,
predictedUp, predictedUp,
torqueVector, torqueVector,
@ -1437,37 +1437,38 @@ namespace OpenSim.Region.Physics.BulletSPlugin
// http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no // http://stackoverflow.com/questions/14939657/computing-vector-from-quaternion-works-computing-quaternion-from-vector-does-no
// Create a rotation that is only the vehicle's rotation around Z // Create a rotation that is only the vehicle's rotation around Z
Vector3 currentEuler = Vector3.Zero; Vector3 currentEulerW = Vector3.Zero;
VehicleOrientation.GetEulerAngles(out currentEuler.X, out currentEuler.Y, out currentEuler.Z); VehicleOrientation.GetEulerAngles(out currentEulerW.X, out currentEulerW.Y, out currentEulerW.Z);
Quaternion justZOrientation = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, currentEuler.Z); Quaternion justZOrientation = Quaternion.CreateFromAxisAngle(Vector3.UnitZ, currentEulerW.Z);
// Create the axis that is perpendicular to the up vector and the rotated up vector. // Create the axis that is perpendicular to the up vector and the rotated up vector.
Vector3 differenceAxis = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation); Vector3 differenceAxisW = Vector3.Cross(Vector3.UnitZ * justZOrientation, Vector3.UnitZ * VehicleOrientation);
// Compute the angle between those to vectors. // Compute the angle between those to vectors.
double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleOrientation))); double differenceAngle = Math.Acos((double)Vector3.Dot(Vector3.UnitZ, Vector3.Normalize(Vector3.UnitZ * VehicleOrientation)));
// 'differenceAngle' is the angle to rotate and 'differenceAxis' is the plane to rotate in to get the vehicle vertical // 'differenceAngle' is the angle to rotate and 'differenceAxis' is the plane to rotate in to get the vehicle vertical
// Reduce the change by the time period it is to change in. Timestep is handled when velocity is applied. // Reduce the change by the time period it is to change in. Timestep is handled when velocity is applied.
// TODO: add 'efficiency'. // TODO: add 'efficiency'.
differenceAngle /= m_verticalAttractionTimescale; // differenceAngle /= m_verticalAttractionTimescale;
// Create the quaterian representing the correction angle // Create the quaterian representing the correction angle
Quaternion correctionRotation = Quaternion.CreateFromAxisAngle(differenceAxis, (float)differenceAngle); Quaternion correctionRotationW = Quaternion.CreateFromAxisAngle(differenceAxisW, (float)differenceAngle);
// Turn that quaternion into Euler values to make it into velocities to apply. // Turn that quaternion into Euler values to make it into velocities to apply.
Vector3 vertContributionV = Vector3.Zero; Vector3 vertContributionW = Vector3.Zero;
correctionRotation.GetEulerAngles(out vertContributionV.X, out vertContributionV.Y, out vertContributionV.Z); correctionRotationW.GetEulerAngles(out vertContributionW.X, out vertContributionW.Y, out vertContributionW.Z);
vertContributionV *= -1f; vertContributionW *= -1f;
vertContributionW /= m_verticalAttractionTimescale;
VehicleRotationalVelocity += vertContributionV; VehicleRotationalVelocity += vertContributionW;
VDetailLog("{0}, MoveAngular,verticalAttraction,upAxis={1},diffAxis={2},diffAng={3},corrRot={4},contrib={5}", VDetailLog("{0}, MoveAngular,verticalAttraction,upAxis={1},diffAxis={2},diffAng={3},corrRot={4},contrib={5}",
ControllingPrim.LocalID, ControllingPrim.LocalID,
vehicleUpAxis, vehicleUpAxis,
differenceAxis, differenceAxisW,
differenceAngle, differenceAngle,
correctionRotation, correctionRotationW,
vertContributionV); vertContributionW);
break; break;
} }
case 2: case 2:

18
OpenSim/Region/Physics/BulletSPlugin/BSLinkset.cs
View File

@ -309,16 +309,18 @@ public abstract class BSLinkset
} }
); );
} }
public virtual void ComputeLocalInertia(OMV.Vector3 inertiaFactor) public virtual void ComputeAndSetLocalInertia(OMV.Vector3 inertiaFactor, float linksetMass)
{ {
ForEachMember((member) => ForEachMember((member) =>
{ {
if (member.PhysBody.HasPhysicalBody) if (member.PhysBody.HasPhysicalBody)
{ {
OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, member.Mass); OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(member.PhysShape.physShapeInfo, linksetMass);
member.Inertia = inertia * inertiaFactor; member.Inertia = inertia * inertiaFactor;
m_physicsScene.PE.SetMassProps(member.PhysBody, member.Mass, member.Inertia); m_physicsScene.PE.SetMassProps(member.PhysBody, linksetMass, member.Inertia);
m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody); m_physicsScene.PE.UpdateInertiaTensor(member.PhysBody);
DetailLog("{0},BSLinkset.ComputeAndSetLocalInertia,m.mass={1}, inertia={2}", member.LocalID, linksetMass, member.Inertia);
} }
return false; // 'false' says to continue looping return false; // 'false' says to continue looping
} }
@ -334,6 +336,16 @@ public abstract class BSLinkset
} }
); );
} }
public virtual void AddToPhysicalCollisionFlags(CollisionFlags collFlags)
{
ForEachMember((member) =>
{
if (member.PhysBody.HasPhysicalBody)
m_physicsScene.PE.AddToCollisionFlags(member.PhysBody, collFlags);
return false; // 'false' says to continue looping
}
);
}
public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags) public virtual void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
{ {
ForEachMember((member) => ForEachMember((member) =>

11
OpenSim/Region/Physics/BulletSPlugin/BSLinksetCompound.cs
View File

@ -61,11 +61,11 @@ public sealed class BSLinksetCompound : BSLinkset
if (LinksetRoot.PhysBody.HasPhysicalBody) if (LinksetRoot.PhysBody.HasPhysicalBody)
m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity); m_physicsScene.PE.SetGravity(LinksetRoot.PhysBody, gravity);
} }
public override void ComputeLocalInertia(OMV.Vector3 inertiaFactor) public override void ComputeAndSetLocalInertia(OMV.Vector3 inertiaFactor, float linksetMass)
{ {
OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, LinksetRoot.Mass); OMV.Vector3 inertia = m_physicsScene.PE.CalculateLocalInertia(LinksetRoot.PhysShape.physShapeInfo, linksetMass);
LinksetRoot.Inertia = inertia * inertiaFactor; LinksetRoot.Inertia = inertia * inertiaFactor;
m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, LinksetRoot.Mass, LinksetRoot.Inertia); m_physicsScene.PE.SetMassProps(LinksetRoot.PhysBody, linksetMass, LinksetRoot.Inertia);
m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody); m_physicsScene.PE.UpdateInertiaTensor(LinksetRoot.PhysBody);
} }
public override void SetPhysicalCollisionFlags(CollisionFlags collFlags) public override void SetPhysicalCollisionFlags(CollisionFlags collFlags)
@ -73,6 +73,11 @@ public sealed class BSLinksetCompound : BSLinkset
if (LinksetRoot.PhysBody.HasPhysicalBody) if (LinksetRoot.PhysBody.HasPhysicalBody)
m_physicsScene.PE.SetCollisionFlags(LinksetRoot.PhysBody, collFlags); m_physicsScene.PE.SetCollisionFlags(LinksetRoot.PhysBody, collFlags);
} }
public override void AddToPhysicalCollisionFlags(CollisionFlags collFlags)
{
if (LinksetRoot.PhysBody.HasPhysicalBody)
m_physicsScene.PE.AddToCollisionFlags(LinksetRoot.PhysBody, collFlags);
}
public override void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags) public override void RemoveFromPhysicalCollisionFlags(CollisionFlags collFlags)
{ {
if (LinksetRoot.PhysBody.HasPhysicalBody) if (LinksetRoot.PhysBody.HasPhysicalBody)

13
OpenSim/Region/Physics/BulletSPlugin/BSParam.cs
View File

@ -463,7 +463,7 @@ public static class BSParam
// Density is passed around as 100kg/m3. This scales that to 1kg/m3. // Density is passed around as 100kg/m3. This scales that to 1kg/m3.
// Reduce by power of 100 because Bullet doesn't seem to handle objects with large mass very well // Reduce by power of 100 because Bullet doesn't seem to handle objects with large mass very well
new ParameterDefn<float>("DensityScaleFactor", "Conversion for simulator/viewer density (100kg/m3) to physical density (1kg/m3)", new ParameterDefn<float>("DensityScaleFactor", "Conversion for simulator/viewer density (100kg/m3) to physical density (1kg/m3)",
0.0001f ), 0.01f ),
new ParameterDefn<float>("PID_D", "Derivitive factor for motion smoothing", new ParameterDefn<float>("PID_D", "Derivitive factor for motion smoothing",
2200f ), 2200f ),
@ -474,8 +474,9 @@ public static class BSParam
0.2f, 0.2f,
(s) => { return DefaultFriction; }, (s) => { return DefaultFriction; },
(s,v) => { DefaultFriction = v; s.UnmanagedParams[0].defaultFriction = v; } ), (s,v) => { DefaultFriction = v; s.UnmanagedParams[0].defaultFriction = v; } ),
// For historical reasons, the viewer and simulator multiply the density by 100
new ParameterDefn<float>("DefaultDensity", "Density for new objects" , new ParameterDefn<float>("DefaultDensity", "Density for new objects" ,
10.000006836f, // Aluminum g/cm3 1000.0006836f, // Aluminum g/cm3 * 100
(s) => { return DefaultDensity; }, (s) => { return DefaultDensity; },
(s,v) => { DefaultDensity = v; s.UnmanagedParams[0].defaultDensity = v; } ), (s,v) => { DefaultDensity = v; s.UnmanagedParams[0].defaultDensity = v; } ),
new ParameterDefn<float>("DefaultRestitution", "Bouncyness of an object" , new ParameterDefn<float>("DefaultRestitution", "Bouncyness of an object" ,
@ -555,8 +556,9 @@ public static class BSParam
0.95f ), 0.95f ),
new ParameterDefn<float>("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run", new ParameterDefn<float>("AvatarAlwaysRunFactor", "Speed multiplier if avatar is set to always run",
1.3f ), 1.3f ),
new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation.", // For historical reasons, density is reported * 100
3.5f) , new ParameterDefn<float>("AvatarDensity", "Density of an avatar. Changed on avatar recreation. Scaled times 100.",
3500f) , // 3.5 * 100
new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.", new ParameterDefn<float>("AvatarRestitution", "Bouncyness. Changed on avatar recreation.",
0f ), 0f ),
new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule", new ParameterDefn<float>("AvatarCapsuleWidth", "The distance between the sides of the avatar capsule",
@ -608,9 +610,8 @@ public static class BSParam
0.0f ), 0.0f ),
new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)", new ParameterDefn<float>("VehicleRestitution", "Bouncyness factor for vehicles (0.0 - 1.0)",
0.0f ), 0.0f ),
// Turn off fudge with DensityScaleFactor = 0.0001. Value used to be 0.2f;
new ParameterDefn<float>("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)", new ParameterDefn<float>("VehicleGroundGravityFudge", "Factor to multiply gravity if a ground vehicle is probably on the ground (0.0 - 1.0)",
1.0f ), 0.2f ),
new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.", new ParameterDefn<float>("VehicleAngularBankingTimescaleFudge", "Factor to multiple angular banking timescale. Tune to increase realism.",
60.0f ), 60.0f ),
new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect", new ParameterDefn<bool>("VehicleEnableLinearDeflection", "Turn on/off vehicle linear deflection effect",

15
OpenSim/Region/Physics/BulletSPlugin/BSPhysObject.cs
View File

@ -187,10 +187,23 @@ public abstract class BSPhysObject : PhysicsActor
MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false); MaterialAttributes matAttrib = BSMaterials.GetAttributes(Material, false);
Friction = matAttrib.friction; Friction = matAttrib.friction;
Restitution = matAttrib.restitution; Restitution = matAttrib.restitution;
Density = matAttrib.density / BSParam.DensityScaleFactor; Density = matAttrib.density;
// DetailLog("{0},{1}.SetMaterial,Mat={2},frict={3},rest={4},den={5}", LocalID, TypeName, Material, Friction, Restitution, Density); // DetailLog("{0},{1}.SetMaterial,Mat={2},frict={3},rest={4},den={5}", LocalID, TypeName, Material, Friction, Restitution, Density);
} }
public override float Density
{
get
{
return base.Density;
}
set
{
DetailLog("{0},BSPhysObject.Density,set,den={1}", LocalID, value);
base.Density = value;
}
}
// Stop all physical motion. // Stop all physical motion.
public abstract void ZeroMotion(bool inTaintTime); public abstract void ZeroMotion(bool inTaintTime);
public abstract void ZeroAngularMotion(bool inTaintTime); public abstract void ZeroAngularMotion(bool inTaintTime);

513
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
View File

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.IO; using System.IO;
using System.Net; using System.Net;
using System.Reflection; using System.Reflection;
@ -122,7 +123,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
m_Enabled = true; m_Enabled = true;
} }
#region IAssetService #region IAssetService
public AssetBase Get(string id) public AssetBase Get(string id)
{ {
@ -140,8 +141,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
return asset; return asset;
} }
return GetRemote(id); return SimianGetOperation(id);
} }
public AssetBase GetCached(string id) public AssetBase GetCached(string id)
{ {
@ -164,8 +166,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
AssetMetadata metadata = null;
// Cache fetch // Cache fetch
if (m_cache != null) if (m_cache != null)
{ {
@ -174,50 +174,18 @@ namespace OpenSim.Services.Connectors.SimianGrid
return asset.Metadata; return asset.Metadata;
} }
Uri url; // return GetRemoteMetadata(id);
return SimianGetMetadataOperation(id);
// Determine if id is an absolute URL or a grid-relative UUID
if (!Uri.TryCreate(id, UriKind.Absolute, out url))
url = new Uri(m_serverUrl + id);
try
{
HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
request.Method = "HEAD";
using (WebResponse response = request.GetResponse())
{
using (Stream responseStream = response.GetResponseStream())
{
// Create the metadata object
metadata = new AssetMetadata();
metadata.ContentType = response.ContentType;
metadata.ID = id;
UUID uuid;
if (UUID.TryParse(id, out uuid))
metadata.FullID = uuid;
string lastModifiedStr = response.Headers.Get("Last-Modified");
if (!String.IsNullOrEmpty(lastModifiedStr))
{
DateTime lastModified;
if (DateTime.TryParse(lastModifiedStr, out lastModified))
metadata.CreationDate = lastModified;
}
}
}
}
catch (Exception ex)
{
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message);
}
return metadata;
} }
public byte[] GetData(string id) public byte[] GetData(string id)
{ {
if (String.IsNullOrEmpty(m_serverUrl))
{
m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
throw new InvalidOperationException();
}
AssetBase asset = Get(id); AssetBase asset = Get(id);
if (asset != null) if (asset != null)
@ -255,7 +223,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
Util.FireAndForget( Util.FireAndForget(
delegate(object o) delegate(object o)
{ {
AssetBase asset = GetRemote(id); AssetBase asset = SimianGetOperation(id);
handler(id, sender, asset); handler(id, sender, asset);
} }
); );
@ -278,7 +246,6 @@ namespace OpenSim.Services.Connectors.SimianGrid
} }
bool storedInCache = false; bool storedInCache = false;
string errorMessage = null;
// AssetID handling // AssetID handling
if (String.IsNullOrEmpty(asset.ID) || asset.ID == ZeroID) if (String.IsNullOrEmpty(asset.ID) || asset.ID == ZeroID)
@ -307,83 +274,9 @@ namespace OpenSim.Services.Connectors.SimianGrid
return asset.ID; return asset.ID;
} }
// Distinguish public and private assets return SimianStoreOperation(asset);
bool isPublic = true;
switch ((AssetType)asset.Type)
{
case AssetType.CallingCard:
case AssetType.Gesture:
case AssetType.LSLBytecode:
case AssetType.LSLText:
isPublic = false;
break;
}
// Make sure ContentType is set
if (String.IsNullOrEmpty(asset.Metadata.ContentType))
asset.Metadata.ContentType = SLUtil.SLAssetTypeToContentType(asset.Type);
// Build the remote storage request
List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
{
new MultipartForm.Parameter("AssetID", asset.FullID.ToString()),
new MultipartForm.Parameter("CreatorID", asset.Metadata.CreatorID),
new MultipartForm.Parameter("Temporary", asset.Temporary ? "1" : "0"),
new MultipartForm.Parameter("Public", isPublic ? "1" : "0"),
new MultipartForm.File("Asset", asset.Name, asset.Metadata.ContentType, asset.Data)
};
// Make the remote storage request
try
{
// Simian does not require the asset ID to be in the URL because it's in the post data.
// By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
{
using (Stream responseStream = response.GetResponseStream())
{
string responseStr = null;
try
{
responseStr = responseStream.GetStreamString();
OSD responseOSD = OSDParser.Deserialize(responseStr);
if (responseOSD.Type == OSDType.Map)
{
OSDMap responseMap = (OSDMap)responseOSD;
if (responseMap["Success"].AsBoolean())
return asset.ID;
else
errorMessage = "Upload failed: " + responseMap["Message"].AsString();
}
else
{
errorMessage = "Response format was invalid:\n" + responseStr;
}
}
catch (Exception ex)
{
if (!String.IsNullOrEmpty(responseStr))
errorMessage = "Failed to parse the response:\n" + responseStr;
else
errorMessage = "Failed to retrieve the response: " + ex.Message;
}
}
}
}
catch (WebException ex)
{
errorMessage = ex.Message;
}
m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}",
asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage);
return null;
} }
/// <summary> /// <summary>
/// Update an asset's content /// Update an asset's content
/// </summary> /// </summary>
@ -393,11 +286,17 @@ namespace OpenSim.Services.Connectors.SimianGrid
/// <returns></returns> /// <returns></returns>
public bool UpdateContent(string id, byte[] data) public bool UpdateContent(string id, byte[] data)
{ {
if (String.IsNullOrEmpty(m_serverUrl))
{
m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI configured");
throw new InvalidOperationException();
}
AssetBase asset = Get(id); AssetBase asset = Get(id);
if (asset == null) if (asset == null)
{ {
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset " + id + " for updating"); m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to fetch asset {0} for updating", id);
return false; return false;
} }
@ -420,83 +319,347 @@ namespace OpenSim.Services.Connectors.SimianGrid
throw new InvalidOperationException(); throw new InvalidOperationException();
} }
//string errorMessage = String.Empty;
string url = m_serverUrl + id;
if (m_cache != null) if (m_cache != null)
m_cache.Expire(id); m_cache.Expire(id);
return SimianDeleteOperation(id);
}
#endregion IAssetService
#region SimianOperations
/// <summary>
/// Invokes the xRemoveAsset operation on the simian server to delete an asset
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
private bool SimianDeleteOperation(string id)
{
try try
{ {
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(url); NameValueCollection requestArgs = new NameValueCollection
request.Method = "DELETE";
using (HttpWebResponse response = (HttpWebResponse)request.GetResponse())
{
if (response.StatusCode != HttpStatusCode.NoContent)
{ {
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Unexpected response when deleting asset " + url + ": " + { "RequestMethod", "xRemoveAsset" },
response.StatusCode + " (" + response.StatusDescription + ")"); { "AssetID", id }
} };
}
OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
if (! response["Success"].AsBoolean())
{
m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset; {0}",response["Message"].AsString());
return false;
}
return true; return true;
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Failed to delete asset " + id + " from the asset service: " + ex.Message); m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to delete asset {0}; {1}", id, ex.Message);
return false;
} }
return false;
} }
#endregion IAssetService /// <summary>
/// Invokes the xAddAsset operation on the simian server to create or update an asset
private AssetBase GetRemote(string id) /// </summary>
/// <param name="id"></param>
/// <returns></returns>
private string SimianStoreOperation(AssetBase asset)
{ {
AssetBase asset = null;
Uri url;
// Determine if id is an absolute URL or a grid-relative UUID
if (!Uri.TryCreate(id, UriKind.Absolute, out url))
url = new Uri(m_serverUrl + id);
try try
{ {
HttpWebRequest request = UntrustedHttpWebRequest.Create(url); NameValueCollection requestArgs = new NameValueCollection
using (WebResponse response = request.GetResponse())
{
using (Stream responseStream = response.GetResponseStream())
{ {
string creatorID = response.Headers.GetOne("X-Asset-Creator-Id") ?? String.Empty; { "RequestMethod", "xAddAsset" },
{ "ContentType", asset.Metadata.ContentType },
// Create the asset object { "EncodedData", Convert.ToBase64String(asset.Data) },
asset = new AssetBase(id, String.Empty, SLUtil.ContentTypeToSLAssetType(response.ContentType), creatorID); { "AssetID", asset.FullID.ToString() },
{ "CreatorID", asset.Metadata.CreatorID },
UUID assetID; { "Temporary", asset.Temporary ? "1" : "0" },
if (UUID.TryParse(id, out assetID)) { "Name", asset.Name }
asset.FullID = assetID; };
// Grab the asset data from the response stream OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
using (MemoryStream stream = new MemoryStream()) if (! response["Success"].AsBoolean())
{ {
responseStream.CopyStream(stream, Int32.MaxValue); m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",response["Message"].AsString());
asset.Data = stream.ToArray(); return null;
}
}
} }
// Cache store // asset.ID is always set before calling this function
if (m_cache != null && asset != null) return asset.ID;
m_cache.Cache(asset);
}
catch (Exception ex)
{
m_log.ErrorFormat("[SIMIAN ASSET CONNECTOR] failed to store asset; {0}",ex.Message);
}
return null;
}
/// <summary>
/// Invokes the xGetAsset operation on the simian server to get data associated with an asset
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
private AssetBase SimianGetOperation(string id)
{
try
{
NameValueCollection requestArgs = new NameValueCollection
{
{ "RequestMethod", "xGetAsset" },
{ "ID", id }
};
OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
if (! response["Success"].AsBoolean())
{
m_log.WarnFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset; {0}",response["Message"].AsString());
return null;
}
AssetBase asset = new AssetBase();
asset.ID = id;
asset.Name = String.Empty;
asset.Metadata.ContentType = response["ContentType"].AsString(); // this will also set the asset Type property
asset.CreatorID = response["CreatorID"].AsString();
asset.Data = System.Convert.FromBase64String(response["EncodedData"].AsString());
asset.Local = false;
asset.Temporary = response["Temporary"];
return asset; return asset;
} }
catch (Exception ex) catch (Exception ex)
{ {
m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message); m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: failed to retrieve asset {0}; {1}", id, ex.Message);
return null;
} }
return null;
} }
/// <summary>
/// Invokes the xGetAssetMetadata operation on the simian server to retrieve metadata for an asset
/// This operation is generally used to determine if an asset exists in the database
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
private AssetMetadata SimianGetMetadataOperation(string id)
{
try
{
NameValueCollection requestArgs = new NameValueCollection
{
{ "RequestMethod", "xGetAssetMetadata" },
{ "ID", id }
};
OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
if (! response["Success"].AsBoolean())
{
// this is not really an error, this call is used to test existence
// m_log.DebugFormat("[SIMIAN ASSET CONNECTOR] Failed to get asset metadata; {0}",response["Message"].AsString());
return null;
}
AssetMetadata metadata = new AssetMetadata();
metadata.ID = id;
metadata.ContentType = response["ContentType"].AsString();
metadata.CreatorID = response["CreatorID"].AsString();
metadata.Local = false;
metadata.Temporary = response["Temporary"];
string lastModifiedStr = response["Last-Modified"].AsString();
if (! String.IsNullOrEmpty(lastModifiedStr))
{
DateTime lastModified;
if (DateTime.TryParse(lastModifiedStr, out lastModified))
metadata.CreationDate = lastModified;
}
return metadata;
}
catch (Exception ex)
{
m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to get asset metadata; {0}", ex.Message);
}
return null;
}
#endregion
// private AssetMetadata GetRemoteMetadata(string id)
// {
// Uri url;
// AssetMetadata metadata = null;
// // Determine if id is an absolute URL or a grid-relative UUID
// if (!Uri.TryCreate(id, UriKind.Absolute, out url))
// url = new Uri(m_serverUrl + id);
// try
// {
// HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
// request.Method = "HEAD";
// using (WebResponse response = request.GetResponse())
// {
// using (Stream responseStream = response.GetResponseStream())
// {
// // Create the metadata object
// metadata = new AssetMetadata();
// metadata.ContentType = response.ContentType;
// metadata.ID = id;
// UUID uuid;
// if (UUID.TryParse(id, out uuid))
// metadata.FullID = uuid;
// string lastModifiedStr = response.Headers.Get("Last-Modified");
// if (!String.IsNullOrEmpty(lastModifiedStr))
// {
// DateTime lastModified;
// if (DateTime.TryParse(lastModifiedStr, out lastModified))
// metadata.CreationDate = lastModified;
// }
// }
// }
// }
// catch (Exception ex)
// {
// m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset HEAD from " + url + " failed: " + ex.Message);
// }
// return metadata;
// }
// private AssetBase GetRemote(string id)
// {
// AssetBase asset = null;
// Uri url;
// // Determine if id is an absolute URL or a grid-relative UUID
// if (!Uri.TryCreate(id, UriKind.Absolute, out url))
// url = new Uri(m_serverUrl + id);
// try
// {
// HttpWebRequest request = UntrustedHttpWebRequest.Create(url);
// using (WebResponse response = request.GetResponse())
// {
// using (Stream responseStream = response.GetResponseStream())
// {
// string creatorID = response.Headers.GetOne("X-Asset-Creator-Id") ?? String.Empty;
// // Create the asset object
// asset = new AssetBase(id, String.Empty, SLUtil.ContentTypeToSLAssetType(response.ContentType), creatorID);
// UUID assetID;
// if (UUID.TryParse(id, out assetID))
// asset.FullID = assetID;
// // Grab the asset data from the response stream
// using (MemoryStream stream = new MemoryStream())
// {
// responseStream.CopyStream(stream, Int32.MaxValue);
// asset.Data = stream.ToArray();
// }
// }
// }
// // Cache store
// if (m_cache != null && asset != null)
// m_cache.Cache(asset);
// return asset;
// }
// catch (Exception ex)
// {
// m_log.Warn("[SIMIAN ASSET CONNECTOR]: Asset GET from " + url + " failed: " + ex.Message);
// return null;
// }
// }
// private string StoreRemote(AssetBase asset)
// {
// // Distinguish public and private assets
// bool isPublic = true;
// switch ((AssetType)asset.Type)
// {
// case AssetType.CallingCard:
// case AssetType.Gesture:
// case AssetType.LSLBytecode:
// case AssetType.LSLText:
// isPublic = false;
// break;
// }
// string errorMessage = null;
// // Build the remote storage request
// List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
// {
// new MultipartForm.Parameter("AssetID", asset.FullID.ToString()),
// new MultipartForm.Parameter("CreatorID", asset.Metadata.CreatorID),
// new MultipartForm.Parameter("Temporary", asset.Temporary ? "1" : "0"),
// new MultipartForm.Parameter("Public", isPublic ? "1" : "0"),
// new MultipartForm.File("Asset", asset.Name, asset.Metadata.ContentType, asset.Data)
// };
// // Make the remote storage request
// try
// {
// // Simian does not require the asset ID to be in the URL because it's in the post data.
// // By appending it to the URL also, we allow caching proxies (squid) to invalidate asset URLs
// HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl + asset.FullID.ToString());
// using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
// {
// using (Stream responseStream = response.GetResponseStream())
// {
// string responseStr = null;
// try
// {
// responseStr = responseStream.GetStreamString();
// OSD responseOSD = OSDParser.Deserialize(responseStr);
// if (responseOSD.Type == OSDType.Map)
// {
// OSDMap responseMap = (OSDMap)responseOSD;
// if (responseMap["Success"].AsBoolean())
// return asset.ID;
// else
// errorMessage = "Upload failed: " + responseMap["Message"].AsString();
// }
// else
// {
// errorMessage = "Response format was invalid:\n" + responseStr;
// }
// }
// catch (Exception ex)
// {
// if (!String.IsNullOrEmpty(responseStr))
// errorMessage = "Failed to parse the response:\n" + responseStr;
// else
// errorMessage = "Failed to retrieve the response: " + ex.Message;
// }
// }
// }
// }
// catch (WebException ex)
// {
// errorMessage = ex.Message;
// }
// m_log.WarnFormat("[SIMIAN ASSET CONNECTOR]: Failed to store asset \"{0}\" ({1}, {2}): {3}",
// asset.Name, asset.ID, asset.Metadata.ContentType, errorMessage);
// return null;
// }
} }
} }

12
OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
View File

@ -116,7 +116,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", principalID.ToString() } { "UserID", principalID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Identities"] is OSDArray) if (response["Success"].AsBoolean() && response["Identities"] is OSDArray)
{ {
bool md5hashFound = false; bool md5hashFound = false;
@ -159,7 +159,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "SessionID", token } { "SessionID", token }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
return true; return true;
@ -181,7 +181,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", principalID.ToString() } { "UserID", principalID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
return true; return true;
@ -204,7 +204,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", principalID.ToString() } { "UserID", principalID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["User"] is OSDMap) if (response["Success"].AsBoolean() && response["User"] is OSDMap)
{ {
OSDMap userMap = (OSDMap)response["User"]; OSDMap userMap = (OSDMap)response["User"];
@ -224,7 +224,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", principalID.ToString() } { "UserID", principalID.ToString() }
}; };
response = WebUtil.PostToService(m_serverUrl, requestArgs); response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -303,7 +303,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
return response["SessionID"].AsUUID().ToString(); return response["SessionID"].AsUUID().ToString();
else else

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

@ -122,7 +122,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDMap map = null; OSDMap map = null;
@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "LLPackedAppearance", OSDParser.SerializeJsonString(map) } { "LLPackedAppearance", OSDParser.SerializeJsonString(map) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (! success) if (! success)
@ -189,7 +189,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDMap map = null; OSDMap map = null;
@ -306,7 +306,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "LLAttachments", OSDParser.SerializeJsonString(items) } { "LLAttachments", OSDParser.SerializeJsonString(items) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)

179
OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs Normal file
View File

@ -0,0 +1,179 @@
/*
* Copyright (c) Contributors, http://opensimulator.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSimulator Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System;
using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using System.IO;
using System.Web;
using log4net;
using Nini.Config;
using Mono.Addins;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using Caps = OpenSim.Framework.Capabilities.Caps;
namespace OpenSim.Services.Connectors.SimianGrid
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianExternalCapsModule")]
public class SimianExternalCapsModule : INonSharedRegionModule, IExternalCapsModule
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
private bool m_enabled = true;
private Scene m_scene;
private String m_simianURL;
private IGridUserService m_GridUserService;
#region IRegionModule Members
public string Name
{
get { return this.GetType().Name; }
}
public void Initialise(IConfigSource config)
{
try
{
IConfig m_config;
if ((m_config = config.Configs["SimianExternalCaps"]) != null)
{
m_enabled = m_config.GetBoolean("Enabled", m_enabled);
if ((m_config = config.Configs["SimianGrid"]) != null)
{
m_simianURL = m_config.GetString("SimianServiceURL");
if (String.IsNullOrEmpty(m_simianURL))
m_log.ErrorFormat("[SimianGrid] service URL is not defined");
}
}
else
m_enabled = false;
}
catch (Exception e)
{
m_log.ErrorFormat("[SimianExternalCaps] initialization error: {0}",e.Message);
return;
}
}
public void PostInitialise() { }
public void Close() { }
public void AddRegion(Scene scene)
{
if (! m_enabled)
return;
m_scene = scene;
m_scene.RegisterModuleInterface<IExternalCapsModule>(this);
}
public void RemoveRegion(Scene scene)
{
if (! m_enabled)
return;
m_scene.EventManager.OnRegisterCaps -= RegisterCapsEventHandler;
m_scene.EventManager.OnDeregisterCaps -= DeregisterCapsEventHandler;
}
public void RegionLoaded(Scene scene)
{
if (! m_enabled)
return;
m_scene.EventManager.OnRegisterCaps += RegisterCapsEventHandler;
m_scene.EventManager.OnDeregisterCaps += DeregisterCapsEventHandler;
}
public Type ReplaceableInterface
{
get { return null; }
}
#endregion
#region IExternalCapsModule
// Eg http://grid.sciencesim.com/GridPublic/%CAP%/%OP%/"
public bool RegisterExternalUserCapsHandler(UUID agentID, Caps caps, String capName, String urlSkel)
{
UUID cap = UUID.Random();
// Call to simian to register the cap we generated
// NameValueCollection requestArgs = new NameValueCollection
// {
// { "RequestMethod", "AddCapability" },
// { "Resource", "user" },
// { "Expiration", 0 },
// { "OwnerID", agentID.ToString() },
// { "CapabilityID", cap.ToString() }
// };
// OSDMap response = SimianGrid.PostToService(m_simianURL, requestArgs);
Dictionary<String,String> subs = new Dictionary<String,String>();
subs["%OP%"] = capName;
subs["%USR%"] = agentID.ToString();
subs["%CAP%"] = cap.ToString();
subs["%SIM%"] = m_scene.RegionInfo.RegionID.ToString();
caps.RegisterHandler(capName,ExpandSkeletonURL(urlSkel,subs));
return true;
}
#endregion
#region EventHandlers
public void RegisterCapsEventHandler(UUID agentID, Caps caps) { }
public void DeregisterCapsEventHandler(UUID agentID, Caps caps) { }
#endregion
private String ExpandSkeletonURL(String urlSkel, Dictionary<String,String> subs)
{
String result = urlSkel;
foreach (KeyValuePair<String,String> kvp in subs)
{
result = result.Replace(kvp.Key,kvp.Value);
}
return result;
}
}
}

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

@ -153,7 +153,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Value", flags.ToString() } { "Value", flags.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -180,7 +180,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Key", friend } { "Key", friend }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -200,7 +200,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Type", "Friend" } { "Type", "Friend" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
{ {
return (OSDArray)response["Entries"]; return (OSDArray)response["Entries"];
@ -221,7 +221,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Type", "Friend" } { "Type", "Friend" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Entries"] is OSDArray) if (response["Success"].AsBoolean() && response["Entries"] is OSDArray)
{ {
return (OSDArray)response["Entries"]; return (OSDArray)response["Entries"];

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

@ -26,8 +26,122 @@
*/ */
using System; using System;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Reflection;
using log4net;
using Mono.Addins; using Mono.Addins;
using Nini.Config; using Nini.Config;
using OpenSim.Framework;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using OpenSim.Services.Interfaces;
using OpenMetaverse;
using OpenMetaverse.StructuredData;
[assembly: Addin("SimianGrid", "1.0")] [assembly: Addin("SimianGrid", "1.0")]
[assembly: AddinDependency("OpenSim", "0.5")] [assembly: AddinDependency("OpenSim", "0.5")]
namespace OpenSim.Services.Connectors.SimianGrid
{
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianExternalCapsModule")]
public class SimianGrid : ISharedRegionModule
{
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;
#region IRegionModule Members
public string Name
{
get { return this.GetType().Name; }
}
public void Initialise(IConfigSource config)
{
try
{
m_config = config.Configs["SimianGrid"];
if (m_config != null)
{
m_simianURL = m_config.GetString("SimianServiceURL");
if (String.IsNullOrEmpty(m_simianURL))
m_log.ErrorFormat("[SimianGrid] service URL is not defined");
InitialiseSimCap();
SimulatorCapability = SimulatorCapability.Trim();
m_log.WarnFormat("[SimianExternalCaps] using {0} as simulator capability",SimulatorCapability);
}
}
catch (Exception e)
{
m_log.ErrorFormat("[SimianExternalCaps] initialization error: {0}",e.Message);
return;
}
}
public void PostInitialise() { }
public void Close() { }
public void AddRegion(Scene scene) { }
public void RemoveRegion(Scene scene) { }
public void RegionLoaded(Scene scene) { }
public Type ReplaceableInterface
{
get { return null; }
}
///<summary>
/// Try a variety of methods for finding the simian simulator capability; first check the
/// configuration itself, then look for a file that contains the cap, then finally look
/// for an environment variable that contains it.
///</summary>
private void InitialiseSimCap()
{
if (m_config.Contains("SimulatorCapability"))
{
SimulatorCapability = m_config.GetString("SimulatorCapability");
return;
}
if (m_config.Contains("SimulatorCapabilityFile"))
{
String filename = m_config.GetString("SimulatorCapabilityFile");
if (System.IO.File.Exists(filename))
{
SimulatorCapability = System.IO.File.ReadAllText(filename);
return;
}
}
if (m_config.Contains("SimulatorCapabilityVariable"))
{
String envname = m_config.GetString("SimulatorCapabilityVariable");
String envvalue = System.Environment.GetEnvironmentVariable(envname);
if (envvalue != null)
{
SimulatorCapability = envvalue;
return;
}
}
m_log.WarnFormat("[SimianExternalCaps] no method specified for simulator capability");
}
#endregion
public static String SimulatorCapability = UUID.Zero.ToString();
public static OSDMap PostToService(string url, NameValueCollection data)
{
data["cap"] = SimulatorCapability;
return WebUtil.PostToService(url, data);
}
}
}

135
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
View File

@ -27,6 +27,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.Specialized;
using System.Reflection; using System.Reflection;
using System.Net; using System.Net;
using System.IO; using System.IO;
@ -43,7 +44,8 @@ using OpenSim.Region.Framework.Scenes;
using OpenMetaverse; using OpenMetaverse;
using OpenMetaverse.StructuredData; using OpenMetaverse.StructuredData;
namespace OpenSim.Region.OptionalModules.Simian //namespace OpenSim.Region.OptionalModules.Simian
namespace OpenSim.Services.Connectors.SimianGrid
{ {
/// <summary> /// <summary>
/// </summary> /// </summary>
@ -196,67 +198,84 @@ namespace OpenSim.Region.OptionalModules.Simian
} }
} }
List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>() NameValueCollection requestArgs = new NameValueCollection
{
new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
};
string errorMessage = null;
int tickstart = Util.EnvironmentTickCount();
// Make the remote storage request
try
{
HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
request.Timeout = 20000;
request.ReadWriteTimeout = 5000;
using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
{ {
using (Stream responseStream = response.GetResponseStream()) { "RequestMethod", "xAddMapTile" },
{ { "X", scene.RegionInfo.RegionLocX.ToString() },
string responseStr = responseStream.GetStreamString(); { "Y", scene.RegionInfo.RegionLocY.ToString() },
OSD responseOSD = OSDParser.Deserialize(responseStr); { "ContentType", "image/png" },
if (responseOSD.Type == OSDType.Map) { "EncodedData", System.Convert.ToBase64String(pngData) }
{ };
OSDMap responseMap = (OSDMap)responseOSD;
if (responseMap["Success"].AsBoolean()) OSDMap response = SimianGrid.PostToService(m_serverUrl,requestArgs);
return; if (! response["Success"].AsBoolean())
errorMessage = "Upload failed: " + responseMap["Message"].AsString();
}
else
{
errorMessage = "Response format was invalid:\n" + responseStr;
}
}
}
}
catch (WebException we)
{ {
errorMessage = we.Message; m_log.WarnFormat("[SIMIAN MAPTILE] failed to store map tile; {0}",response["Message"].AsString());
if (we.Status == WebExceptionStatus.ProtocolError) return;
{
HttpWebResponse webResponse = (HttpWebResponse)we.Response;
errorMessage = String.Format("[{0}] {1}",
webResponse.StatusCode,webResponse.StatusDescription);
}
}
catch (Exception ex)
{
errorMessage = ex.Message;
}
finally
{
// This just dumps a warning for any operation that takes more than 100 ms
int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff);
} }
m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}", // List<MultipartForm.Element> postParameters = new List<MultipartForm.Element>()
pngData.Length, scene.RegionInfo.RegionName, errorMessage); // {
// new MultipartForm.Parameter("X", scene.RegionInfo.RegionLocX.ToString()),
// new MultipartForm.Parameter("Y", scene.RegionInfo.RegionLocY.ToString()),
// new MultipartForm.File("Tile", "tile.png", "image/png", pngData)
// };
// string errorMessage = null;
// int tickstart = Util.EnvironmentTickCount();
// // Make the remote storage request
// try
// {
// HttpWebRequest request = (HttpWebRequest)HttpWebRequest.Create(m_serverUrl);
// request.Timeout = 20000;
// request.ReadWriteTimeout = 5000;
// using (HttpWebResponse response = MultipartForm.Post(request, postParameters))
// {
// using (Stream responseStream = response.GetResponseStream())
// {
// string responseStr = responseStream.GetStreamString();
// OSD responseOSD = OSDParser.Deserialize(responseStr);
// if (responseOSD.Type == OSDType.Map)
// {
// OSDMap responseMap = (OSDMap)responseOSD;
// if (responseMap["Success"].AsBoolean())
// return;
// errorMessage = "Upload failed: " + responseMap["Message"].AsString();
// }
// else
// {
// errorMessage = "Response format was invalid:\n" + responseStr;
// }
// }
// }
// }
// catch (WebException we)
// {
// errorMessage = we.Message;
// if (we.Status == WebExceptionStatus.ProtocolError)
// {
// HttpWebResponse webResponse = (HttpWebResponse)we.Response;
// errorMessage = String.Format("[{0}] {1}",
// webResponse.StatusCode,webResponse.StatusDescription);
// }
// }
// catch (Exception ex)
// {
// errorMessage = ex.Message;
// }
// finally
// {
// // This just dumps a warning for any operation that takes more than 100 ms
// int tickdiff = Util.EnvironmentTickCountSubtract(tickstart);
// m_log.DebugFormat("[SIMIAN MAPTILE]: map tile uploaded in {0}ms",tickdiff);
// }
// m_log.WarnFormat("[SIMIAN MAPTILE]: Failed to store {0} byte tile for {1}: {2}",
// pngData.Length, scene.RegionInfo.RegionName, errorMessage);
} }
} }
} }

18
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -140,7 +140,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ExtraData", OSDParser.SerializeJsonString(extraData) } { "ExtraData", OSDParser.SerializeJsonString(extraData) }
}; };
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
return String.Empty; return String.Empty;
else else
@ -156,7 +156,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Enabled", "0" } { "Enabled", "0" }
}; };
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -203,7 +203,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region with uuid {0}",regionID.ToString()); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region with uuid {0}",regionID.ToString());
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] uuid request successful {0}",response["Name"].AsString()); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] uuid request successful {0}",response["Name"].AsString());
@ -231,7 +231,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString()); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request grid at {0}",position.ToString());
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] position request successful {0}",response["Name"].AsString()); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] position request successful {0}",response["Name"].AsString());
@ -272,7 +272,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions with name {0}",name); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions with name {0}",name);
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name);
@ -310,7 +310,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
//m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString()); //m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request regions by range {0} to {1}",minPosition.ToString(),maxPosition.ToString());
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDArray array = response["Scenes"] as OSDArray; OSDArray array = response["Scenes"] as OSDArray;
@ -361,7 +361,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Enabled", "1" } { "Enabled", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
// m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name); // m_log.DebugFormat("[SIMIAN GRID CONNECTOR] found regions with name {0}",name);
@ -391,7 +391,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region flags for {0}",regionID.ToString()); m_log.DebugFormat("[SIMIAN GRID CONNECTOR] request region flags for {0}",regionID.ToString());
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDMap extraData = response["ExtraData"] as OSDMap; OSDMap extraData = response["ExtraData"] as OSDMap;
@ -498,7 +498,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
if (onlyEnabled) if (onlyEnabled)
requestArgs["Enabled"] = "1"; requestArgs["Enabled"] = "1";
OSDMap response = WebUtil.PostToService(m_ServerURI, requestArgs); OSDMap response = SimianGrid.PostToService(m_ServerURI, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
return ResponseToGridRegion(response); return ResponseToGridRegion(response);

30
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@ -156,7 +156,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "OwnerID", userID.ToString() } { "OwnerID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -182,7 +182,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "0" } { "ChildrenOnly", "0" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
OSDArray items = (OSDArray)response["Items"]; OSDArray items = (OSDArray)response["Items"];
@ -244,7 +244,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "1" } { "ChildrenOnly", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
OSDArray items = (OSDArray)response["Items"]; OSDArray items = (OSDArray)response["Items"];
@ -274,7 +274,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "OwnerID", userID.ToString() } { "OwnerID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Folder"] is OSDMap) if (response["Success"].AsBoolean() && response["Folder"] is OSDMap)
{ {
OSDMap folder = (OSDMap)response["Folder"]; OSDMap folder = (OSDMap)response["Folder"];
@ -312,7 +312,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "1" } { "ChildrenOnly", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
List<InventoryItemBase> items = GetItemsFromResponse((OSDArray)response["Items"]); List<InventoryItemBase> items = GetItemsFromResponse((OSDArray)response["Items"]);
@ -349,7 +349,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "1" } { "ChildrenOnly", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
OSDArray items = (OSDArray)response["Items"]; OSDArray items = (OSDArray)response["Items"];
@ -383,7 +383,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "1" } { "ChildrenOnly", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
OSDArray items = (OSDArray)response["Items"]; OSDArray items = (OSDArray)response["Items"];
@ -423,7 +423,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ChildrenOnly", "1" } { "ChildrenOnly", "1" }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["Items"] is OSDArray) if (response["Success"].AsBoolean() && response["Items"] is OSDArray)
{ {
OSDArray items = (OSDArray)response["Items"]; OSDArray items = (OSDArray)response["Items"];
@ -454,7 +454,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ContentType", SLUtil.SLAssetTypeToContentType(folder.Type) } { "ContentType", SLUtil.SLAssetTypeToContentType(folder.Type) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -518,7 +518,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ItemID", itemID.ToString() } { "ItemID", itemID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -546,7 +546,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "FolderID", folder.ID.ToString() } { "FolderID", folder.ID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -623,7 +623,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "ExtraData", OSDParser.SerializeJsonString(extraData) } { "ExtraData", OSDParser.SerializeJsonString(extraData) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -847,7 +847,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Items", String.Join(",", itemIDs) } { "Items", String.Join(",", itemIDs) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -885,7 +885,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_userServerUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDMap user = response["User"] as OSDMap; OSDMap user = response["User"] as OSDMap;
@ -916,7 +916,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "Gestures", OSDParser.SerializeJsonString(gestures) } { "Gestures", OSDParser.SerializeJsonString(gestures) }
}; };
OSDMap response = WebUtil.PostToService(m_userServerUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_userServerUrl, requestArgs);
if (!response["Success"].AsBoolean()) if (!response["Success"].AsBoolean())
{ {
m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " + m_log.Warn("[SIMIAN INVENTORY CONNECTOR]: Failed to save active gestures for " + userID + ": " +

18
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@ -149,7 +149,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
requestArgs["SecureSessionID"] = secureSessionID.ToString(); requestArgs["SecureSessionID"] = secureSessionID.ToString();
} }
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -168,7 +168,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "SessionID", sessionID.ToString() } { "SessionID", sessionID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -187,7 +187,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "SceneID", regionID.ToString() } { "SceneID", regionID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -232,7 +232,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserIDList", String.Join(",",userIDs) } { "UserIDList", String.Join(",",userIDs) }
}; };
OSDMap sessionListResponse = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap sessionListResponse = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (! sessionListResponse["Success"].AsBoolean()) if (! sessionListResponse["Success"].AsBoolean())
{ {
m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString()); m_log.WarnFormat("[SIMIAN PRESENCE CONNECTOR]: Failed to retrieve sessions: {0}",sessionListResponse["Message"].AsString());
@ -275,7 +275,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) } { "LastLocation", SerializeLocation(regionID, lastPosition, lastLookAt) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -295,7 +295,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "HomeLocation", SerializeLocation(regionID, position, lookAt) } { "HomeLocation", SerializeLocation(regionID, position, lookAt) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -340,7 +340,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["User"] is OSDMap) if (response["Success"].AsBoolean() && response["User"] is OSDMap)
return response; return response;
@ -356,7 +356,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "SessionID", sessionID.ToString() } { "SessionID", sessionID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
return response; return response;
@ -376,7 +376,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "SceneLookAt", lastLookAt.ToString() } { "SceneLookAt", lastLookAt.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)

6
OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
View File

@ -392,7 +392,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", client.AgentId.ToString() } { "UserID", client.AgentId.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
string email = response["Email"].AsString(); string email = response["Email"].AsString();
if (!response["Success"].AsBoolean()) if (!response["Success"].AsBoolean())
@ -443,7 +443,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ key, OSDParser.SerializeJsonString(value) } { key, OSDParser.SerializeJsonString(value) }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (!success) if (!success)
@ -462,7 +462,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserID", userID.ToString() } { "UserID", userID.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean() && response["User"] is OSDMap) if (response["Success"].AsBoolean() && response["User"] is OSDMap)
{ {
return (OSDMap)response["User"]; return (OSDMap)response["User"];

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

@ -165,7 +165,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "NameQuery", query } { "NameQuery", query }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDArray array = response["Users"] as OSDArray; OSDArray array = response["Users"] as OSDArray;
@ -209,7 +209,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "AccessLevel", data.UserLevel.ToString() } { "AccessLevel", data.UserLevel.ToString() }
}; };
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
@ -224,7 +224,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
{ "UserTitle", data.UserTitle } { "UserTitle", data.UserTitle }
}; };
response = WebUtil.PostToService(m_serverUrl, requestArgs); response = SimianGrid.PostToService(m_serverUrl, requestArgs);
bool success = response["Success"].AsBoolean(); bool success = response["Success"].AsBoolean();
if (success) if (success)
@ -257,7 +257,7 @@ namespace OpenSim.Services.Connectors.SimianGrid
string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)"; string lookupValue = (requestArgs.Count > 1) ? requestArgs[1] : "(Unknown)";
// m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue); // m_log.DebugFormat("[SIMIAN ACCOUNT CONNECTOR]: Looking up user account with query: " + lookupValue);
OSDMap response = WebUtil.PostToService(m_serverUrl, requestArgs); OSDMap response = SimianGrid.PostToService(m_serverUrl, requestArgs);
if (response["Success"].AsBoolean()) if (response["Success"].AsBoolean())
{ {
OSDMap user = response["User"] as OSDMap; OSDMap user = response["User"] as OSDMap;

9
bin/config-include/GridCommon.ini.example
View File

@ -205,3 +205,12 @@
; DisallowResidents -- only Admins and Managers allowed ; DisallowResidents -- only Admins and Managers allowed
; Example: ; Example:
; Region_Test_1 = "DisallowForeigners" ; Region_Test_1 = "DisallowForeigners"
;; Uncomment if you are using SimianGrid for grid services
[SimianGrid]
;; SimianGrid services URL
;; SimianServiceURL = "http://grid.sciencesim.com/Grid/"
;; Capability assigned by the grid administrator for the simulator
;; SimulatorCapability = "00000000-0000-0000-0000-000000000000"

2
prebuild.xml
View File

@ -988,8 +988,10 @@
<Reference name="Mono.Addins" path="../../../bin/"/> <Reference name="Mono.Addins" path="../../../bin/"/>
<Reference name="OpenSim.Data"/> <Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Capabilities"/>
<Reference name="OpenSim.Framework.Communications"/> <Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers.HttpServer"/>
<Reference name="OpenSim.Region.Framework"/> <Reference name="OpenSim.Region.Framework"/>
<Reference name="OpenSim.Server.Base"/> <Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Services.Base"/> <Reference name="OpenSim.Services.Base"/>