From 0898be5750a9e5f0cfab566a34b65e4a227d82e6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 31 Jan 2011 22:54:36 +0000
Subject: Change SimianGroupsServicesConnectorModule.GetAgentGroupMembership()
so that it returns null if the user isn't a member of the group.
This matches the behaviour of the same method for Flotsam Groups. This is the behaviour assumed by existing code.
Method doc also added to IGroupsServicesConnector to the make the contract clear.
---
.../XmlRpcGroups/IGroupsServicesConnector.cs | 19 +++++++
.../SimianGroupsServicesConnectorModule.cs | 66 +++++++++++-----------
2 files changed, 52 insertions(+), 33 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
index 5c779de..6d26075 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/IGroupsServicesConnector.cs
@@ -63,7 +63,26 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
void SetAgentActiveGroupRole(UUID RequestingAgentID, UUID AgentID, UUID GroupID, UUID RoleID);
void SetAgentGroupInfo(UUID RequestingAgentID, UUID AgentID, UUID GroupID, bool AcceptNotices, bool ListInProfile);
+ ///
+ /// Get information about a specific group to which the user belongs.
+ ///
+ /// The agent requesting the information.
+ /// The agent requested.
+ /// The group requested.
+ ///
+ /// If the user is a member of the group then the data structure is returned. If not, then null is returned.
+ ///
GroupMembershipData GetAgentGroupMembership(UUID RequestingAgentID, UUID AgentID, UUID GroupID);
+
+ ///
+ /// Get information about the groups to which a user belongs.
+ ///
+ /// The agent requesting the information.
+ /// The agent requested.
+ ///
+ /// Information about the groups to which the user belongs. If the user belongs to no groups then an empty
+ /// list is returned.
+ ///
List GetAgentGroupMemberships(UUID RequestingAgentID, UUID AgentID);
void AddGroupNotice(UUID RequestingAgentID, UUID groupID, UUID noticeID, string fromName, string subject, string message, byte[] binaryBucket);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
index 0d265f2..81725c5 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs
@@ -704,7 +704,6 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
}
}
-
return findings;
}
@@ -712,54 +711,55 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
{
if (m_debugEnabled) m_log.InfoFormat("[SIMIAN-GROUPS-CONNECTOR] {0} called", System.Reflection.MethodBase.GetCurrentMethod().Name);
- GroupMembershipData data = new GroupMembershipData();
-
- ///////////////////////////////
- // Agent Specific Information:
- //
- OSDMap UserActiveGroup;
- if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
- {
- data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID);
- }
+ GroupMembershipData data = null;
+ bool foundData = false;
OSDMap UserGroupMemberInfo;
if (SimianGetGenericEntry(agentID, "GroupMember", groupID.ToString(), out UserGroupMemberInfo))
{
+ data = new GroupMembershipData();
data.AcceptNotices = UserGroupMemberInfo["AcceptNotices"].AsBoolean();
data.Contribution = UserGroupMemberInfo["Contribution"].AsInteger();
data.ListInProfile = UserGroupMemberInfo["ListInProfile"].AsBoolean();
- data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID();
+ data.ActiveRole = UserGroupMemberInfo["SelectedRoleID"].AsUUID();
+
+ ///////////////////////////////
+ // Agent Specific Information:
+ //
+ OSDMap UserActiveGroup;
+ if (SimianGetGenericEntry(agentID, "Group", "ActiveGroup", out UserActiveGroup))
+ {
+ data.Active = UserActiveGroup["GroupID"].AsUUID().Equals(groupID);
+ }
///////////////////////////////
// Role Specific Information:
//
-
OSDMap GroupRoleInfo;
if (SimianGetGenericEntry(groupID, "GroupRole", data.ActiveRole.ToString(), out GroupRoleInfo))
{
data.GroupTitle = GroupRoleInfo["Title"].AsString();
data.GroupPowers = GroupRoleInfo["Powers"].AsULong();
- }
- }
-
- ///////////////////////////////
- // Group Specific Information:
- //
- OSDMap GroupInfo;
- string GroupName;
- if (SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo))
- {
- data.GroupID = groupID;
- data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean();
- data.Charter = GroupInfo["Charter"].AsString();
- data.FounderID = GroupInfo["FounderID"].AsUUID();
- data.GroupName = GroupName;
- data.GroupPicture = GroupInfo["InsigniaID"].AsUUID();
- data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean();
- data.MembershipFee = GroupInfo["MembershipFee"].AsInteger();
- data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean();
- data.ShowInList = GroupInfo["ShowInList"].AsBoolean();
+ }
+
+ ///////////////////////////////
+ // Group Specific Information:
+ //
+ OSDMap GroupInfo;
+ string GroupName;
+ if (SimianGetFirstGenericEntry(groupID, "Group", out GroupName, out GroupInfo))
+ {
+ data.GroupID = groupID;
+ data.AllowPublish = GroupInfo["AllowPublish"].AsBoolean();
+ data.Charter = GroupInfo["Charter"].AsString();
+ data.FounderID = GroupInfo["FounderID"].AsUUID();
+ data.GroupName = GroupName;
+ data.GroupPicture = GroupInfo["InsigniaID"].AsUUID();
+ data.MaturePublish = GroupInfo["MaturePublish"].AsBoolean();
+ data.MembershipFee = GroupInfo["MembershipFee"].AsInteger();
+ data.OpenEnrollment = GroupInfo["OpenEnrollment"].AsBoolean();
+ data.ShowInList = GroupInfo["ShowInList"].AsBoolean();
+ }
}
return data;
--
cgit v1.1
From 2344150b6e9dd056769f8ce565ec35243bef2538 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 2 Feb 2011 19:39:33 +0000
Subject: Stop double counting dequeued packets for packets sent number
This is already being incremented in LLUDPServer.SendPacketFinal for every packet
---
OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index d4c3307..21bd99e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -441,13 +441,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
/// an outgoing packet from each, obeying the throttling bucket limits
///
///
+ ///
/// Packet queues are inspected in ascending numerical order starting from 0. Therefore, queues with a lower
/// ThrottleOutPacketType number will see their packet get sent first (e.g. if both Land and Wind queues have
/// packets, then the packet at the front of the Land queue will be sent before the packet at the front of the
/// wind queue).
///
- /// This function is only called from a synchronous loop in the
- /// UDPServer so we don't need to bother making this thread safe
+ /// This function is only called from a synchronous loop in the
+ /// UDPServer so we don't need to bother making this thread safe
+ ///
+ ///
/// True if any packets were sent, otherwise false
public bool DequeueOutgoing()
{
@@ -476,7 +479,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
m_udpServer.SendPacketFinal(nextPacket);
m_nextPackets[i] = null;
packetSent = true;
- this.PacketsSent++;
}
}
else
@@ -493,7 +495,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Send the packet
m_udpServer.SendPacketFinal(packet);
packetSent = true;
- this.PacketsSent++;
}
else
{
--
cgit v1.1
From 2413e9eb3fe63307660202f913eee1c877340372 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 2 Feb 2011 20:00:50 +0000
Subject: Record number of resent packets in LindenUDP stack and display in
stats report
---
.../Region/ClientStack/LindenUDP/LLUDPClient.cs | 7 +++++--
.../Region/ClientStack/LindenUDP/LLUDPServer.cs | 5 ++++-
.../Agent/UDP/Linden/LindenUDPInfoModule.cs | 24 ++++++++++++----------
3 files changed, 22 insertions(+), 14 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
index 21bd99e..65a8fe3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPClient.cs
@@ -122,6 +122,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public int PacketsReceived;
/// Number of packets sent to this client
public int PacketsSent;
+ /// Number of packets resent to this client
+ public int PacketsResent;
/// Total byte count of unacked packets sent to this client
public int UnackedBytes;
@@ -256,9 +258,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public string GetStats()
{
return string.Format(
- "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}",
+ "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}",
+ PacketsReceived,
PacketsSent,
- PacketsReceived,
+ PacketsResent,
UnackedBytes,
m_packetOutboxes[(int)ThrottleOutPacketType.Resend].Count,
m_packetOutboxes[(int)ThrottleOutPacketType.Land].Count,
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index df8ddbb..5ff9aee 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -506,7 +506,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Bump up the resend count on this packet
Interlocked.Increment(ref outgoingPacket.ResendCount);
- //Interlocked.Increment(ref Stats.ResentPackets);
// Requeue or resend the packet
if (!outgoingPacket.Client.EnqueueOutgoing(outgoingPacket, false))
@@ -582,6 +581,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
udpClient.NeedAcks.Add(outgoingPacket);
}
}
+ else
+ {
+ Interlocked.Increment(ref udpClient.PacketsResent);
+ }
#endregion Sequence Number Assignment
diff --git a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
index 87d067c..6630edb 100644
--- a/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
+++ b/OpenSim/Region/OptionalModules/Agent/UDP/Linden/LindenUDPInfoModule.cs
@@ -154,24 +154,26 @@ namespace OpenSim.Region.CoreModules.UDP.Linden
report.Append(GetColumnEntry("Type", maxTypeLength, columnPadding));
report.AppendFormat(
- "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
+ "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n",
"Pkts",
"Pkts",
+ "Pkts",
"Bytes",
- "Pkts",
- "Pkts",
- "Pkts",
- "Pkts",
- "Pkts",
- "Pkts",
- "Pkts",
- "Pkts");
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts",
+ "Q Pkts");
report.AppendFormat("{0,-" + totalInfoFieldsLength + "}", "");
report.AppendFormat(
- "{0,7} {1,7} {2,9} {3,8} {4,7} {5,7} {6,7} {7,7} {8,9} {9,7} {10,7}\n",
- "Out",
+ "{0,7} {1,7} {2,7} {3,9} {4,7} {5,7} {6,7} {7,7} {8,7} {9,8} {10,7} {11,7}\n",
"In",
+ "Out",
+ "Resent",
"Unacked",
"Resend",
"Land",
--
cgit v1.1
From 4f7cf491e6fa06a6ac4672fa81e707437f3fa537 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 2 Feb 2011 20:02:10 +0000
Subject: Comment out texture CAPS 'texture not found' message for now
---
OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 6fb8b46..df4d561 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -245,14 +245,12 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
WriteTextureData(httpRequest, httpResponse, texture, format);
return true;
}
-
}
// not found
- m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
+// m_log.Warn("[GETTEXTURE]: Texture " + textureID + " not found");
httpResponse.StatusCode = (int)System.Net.HttpStatusCode.NotFound;
return true;
-
}
private void WriteTextureData(OSHttpRequest request, OSHttpResponse response, AssetBase texture, string format)
--
cgit v1.1
From 8fdc810a2329063d136458dff5a4c7d307db3feb Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 3 Feb 2011 04:07:36 -0800
Subject: Addresses mantis #5360: CreatorData was being written as long as it
wasn't null. This made iars backwards incompatible when some items had
non-null foreign creators. This patch adds an explicit option (-c) to
preserve foreign creator information.
---
.../CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 2 ++
1 file changed, 2 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 1a96098..26edba4 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -128,6 +128,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
+ " is the user's last name." + Environment.NewLine
+ " is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
+ "-p|--profile= adds the url of the profile service to the saved user information." + Environment.NewLine
+ + "-c|--creators preserves information about foreign creators." + Environment.NewLine
+ "-v|--verbose extra debug messages." + Environment.NewLine
+ " is the filesystem path at which to save the IAR."
+ string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
@@ -396,6 +397,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
//ops.Add("v|version=", delegate(string v) { options["version"] = v; });
ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
+ ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
List mainParams = ops.Parse(cmdparams);
--
cgit v1.1
From cf24069227f9a32272c873d4423e2e11f5da25a8 Mon Sep 17 00:00:00 2001
From: Mic Bowman
Date: Thu, 3 Feb 2011 12:43:46 -0800
Subject: Change UpdateAgent (for changes in agent position) to be sent once to
each simulator rather than once to each region. This should help with some of
the delays caused by multiple outstanding requests to a single service point.
---
.../Simulation/LocalSimulationConnector.cs | 14 +++----
.../Framework/Scenes/SceneCommunicationService.cs | 43 +++++++++++-----------
2 files changed, 29 insertions(+), 28 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index c5972dd..56720b7 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -225,17 +225,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
if (destination == null)
return false;
+ // We limit the number of messages sent for a position change to just one per
+ // simulator so when we receive the update we need to hand it to each of the
+ // scenes; scenes each check to see if the is a scene presence for the avatar
+ // note that we really don't need the GridRegion for this call
foreach (Scene s in m_sceneList)
{
- if (s.RegionInfo.RegionHandle == destination.RegionHandle)
- {
- //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
- s.IncomingChildAgentDataUpdate(cAgentData);
- return true;
- }
+ //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
+ s.IncomingChildAgentDataUpdate(cAgentData);
}
//m_log.Debug("[LOCAL COMMS]: region not found for ChildAgentUpdate");
- return false;
+ return true;
}
public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index f8ff308..837e655 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -193,7 +193,8 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, ulong regionHandle);
+ public delegate void SendChildAgentDataUpdateDelegate(AgentPosition cAgentData, UUID scopeID, GridRegion dest);
+
///
/// This informs all neighboring regions about the settings of it's child agent.
@@ -202,31 +203,17 @@ namespace OpenSim.Region.Framework.Scenes
/// This contains information, such as, Draw Distance, Camera location, Current Position, Current throttle settings, etc.
///
///
- private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, ulong regionHandle)
+ private void SendChildAgentDataUpdateAsync(AgentPosition cAgentData, UUID scopeID, GridRegion dest)
{
//m_log.Info("[INTERGRID]: Informing neighbors about my agent in " + m_regionInfo.RegionName);
try
{
- //m_commsProvider.InterRegion.ChildAgentUpdate(regionHandle, cAgentData);
- uint x = 0, y = 0;
- Utils.LongToUInts(regionHandle, out x, out y);
- GridRegion destination = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
- m_scene.SimulationService.UpdateAgent(destination, cAgentData);
+ m_scene.SimulationService.UpdateAgent(dest, cAgentData);
}
catch
{
// Ignore; we did our best
}
-
- //if (regionAccepted)
- //{
- // //m_log.Info("[INTERGRID]: Completed sending a neighbor an update about my agent");
- //}
- //else
- //{
- // //m_log.Info("[INTERGRID]: Failed sending a neighbor an update about my agent");
- //}
-
}
private void SendChildAgentDataUpdateCompleted(IAsyncResult iar)
@@ -240,14 +227,28 @@ namespace OpenSim.Region.Framework.Scenes
// This assumes that we know what our neighbors are.
try
{
+ uint x = 0, y = 0;
+ List simulatorList = new List();
foreach (ulong regionHandle in presence.KnownChildRegionHandles)
{
if (regionHandle != m_regionInfo.RegionHandle)
{
- SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
- d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, regionHandle,
- SendChildAgentDataUpdateCompleted,
- d);
+ // we only want to send one update to each simulator; the simulator will
+ // hand it off to the regions where a child agent exists, this does assume
+ // that the region position is cached or performance will degrade
+ Utils.LongToUInts(regionHandle, out x, out y);
+ GridRegion dest = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
+ if (! simulatorList.Contains(dest.ServerURI))
+ {
+ // we havent seen this simulator before, add it to the list
+ // and send it an update
+ simulatorList.Add(dest.ServerURI);
+
+ SendChildAgentDataUpdateDelegate d = SendChildAgentDataUpdateAsync;
+ d.BeginInvoke(cAgentData, m_regionInfo.ScopeID, dest,
+ SendChildAgentDataUpdateCompleted,
+ d);
+ }
}
}
}
--
cgit v1.1
From 9a9c9644acb4135d168b239f40fd07aafe34f190 Mon Sep 17 00:00:00 2001
From: Tom
Date: Thu, 3 Feb 2011 17:25:55 -0800
Subject: Repair x-query-string
---
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
index 89f5da3..66eb747 100644
--- a/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
@@ -444,7 +444,7 @@ namespace OpenSim.Region.CoreModules.Scripting.LSLHttp
if (request.ContainsKey(key))
{
string val = (String)request[key];
- if (key == "")
+ if (key != "")
{
queryString = queryString + key + "=" + val + "&";
}
--
cgit v1.1
From 1613d89383574f7bba3102376e6f3a2ee99b1270 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 20:51:51 +0000
Subject: minor: Correct misspelling of neighbour in log messages.
Thanks Fly-Man-
---
.../Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 54b95f7..80a8041 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
///
public void EnableChildAgent(ScenePresence sp, GridRegion region)
{
- m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
+ m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName);
AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
--
cgit v1.1
From 034327b51fc496702b84b101123140b017bf68ff Mon Sep 17 00:00:00 2001
From: Kevin Cozens
Date: Thu, 3 Feb 2011 12:03:17 -0500
Subject: Send object date to viewer in microseconds (Fixes mantis bug #3990)
---
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 4fcd8f5..6a92378 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -2055,8 +2055,9 @@ namespace OpenSim.Region.Framework.Scenes
public void GetProperties(IClientAPI client)
{
+ //Viewer wants date in microseconds so multiply it by 1,000,000.
client.SendObjectPropertiesReply(
- m_fromUserInventoryItemID, (ulong)_creationDate, _creatorID, UUID.Zero, UUID.Zero,
+ m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero,
_groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID,
ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask,
--
cgit v1.1
From 3585130ac8b805296323105a5b50c5d416210266 Mon Sep 17 00:00:00 2001
From: unknown
Date: Mon, 31 Jan 2011 02:42:22 -0500
Subject: SetTexture_fix
---
.../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 30fb252..38a16a4 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1750,13 +1750,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{
UUID textureID=new UUID();
- if (!UUID.TryParse(texture, out textureID))
- {
- textureID=InventoryKey(texture, (int)AssetType.Texture);
- }
-
- if (textureID == UUID.Zero)
- return;
+ textureID=InventoryKey(texture, (int)AssetType.Texture);
+ if (textureID == UUID.Zero)
+ {
+ if (!UUID.TryParse(texture, out textureID))
+ return;
+ }
Primitive.TextureEntry tex = part.Shape.Textures;
--
cgit v1.1
From bc2e254b55b65cf267b8027e3e696acbc0f3c60b Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 21:55:22 +0000
Subject: minor: fix indentation, spacing on commit 3585130
this previous commit tries to look up the texture by name first before just using the uuid.
this allows correct resolution of inventory textures which have uuids as names.
---
.../ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 38a16a4..e8da274 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1748,14 +1748,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected void SetTexture(SceneObjectPart part, string texture, int face)
{
- UUID textureID=new UUID();
-
- textureID=InventoryKey(texture, (int)AssetType.Texture);
- if (textureID == UUID.Zero)
- {
- if (!UUID.TryParse(texture, out textureID))
- return;
- }
+ UUID textureID = new UUID();
+
+ textureID = InventoryKey(texture, (int)AssetType.Texture);
+ if (textureID == UUID.Zero)
+ {
+ if (!UUID.TryParse(texture, out textureID))
+ return;
+ }
Primitive.TextureEntry tex = part.Shape.Textures;
--
cgit v1.1
From 722f0ba18cbea725235f1c31cf3bd3d6a66def29 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 23:06:24 +0000
Subject: Put something in the ImprovedInstantMessage.BinaryBucket for
llInstantMessage() to stop this crashing viewer 2.4.0 (1.23.5 was fine with
this).
We're putting in a string of format " which appears to be the expected value.
This resolves http://opensimulator.org/mantis/view.php?id=5356
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e8da274..73fe160 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3063,12 +3063,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
msg.ParentEstateID = 0; //ParentEstateID;
msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition);
msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
- msg.binaryBucket = new byte[0];// binaryBucket;
+ msg.binaryBucket
+ = Util.StringToBytes256(
+ "{0}/{1}/{2}/{3}",
+ World.RegionInfo.RegionName,
+ (int)Math.Floor(m_host.AbsolutePosition.X),
+ (int)Math.Floor(m_host.AbsolutePosition.Y),
+ (int)Math.Floor(m_host.AbsolutePosition.Z));
if (m_TransferModule != null)
{
m_TransferModule.SendInstantMessage(msg, delegate(bool success) {});
}
+
ScriptSleep(2000);
}
--
cgit v1.1
From 5b7a5a5b8b6221b2fe42f645c757c2e5e9132aa6 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 4 Feb 2011 23:14:21 +0000
Subject: Add position to IM sent from llInstantMessage(), to better fulfill
client expectations
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 73fe160..72ee495 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3061,7 +3061,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
msg.fromGroup = false;// fromGroup;
msg.offline = (byte)0; //offline;
msg.ParentEstateID = 0; //ParentEstateID;
- msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition);
+ msg.Position = new Vector3(m_host.AbsolutePosition);
msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
msg.binaryBucket
= Util.StringToBytes256(
--
cgit v1.1
From cdd64bb8f51df51858b841de4def7808735b02dd Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 5 Feb 2011 00:15:25 +0000
Subject: For now, reinstate the call to World.GridService.GetRegionsByName()
commented out in 933f47e
Even though we don't use the results, just getting the regions may have side effects in making hypergrid links available for the later World.RequestTeleportLocation()
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index c0c790d..3f8735e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -702,7 +702,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// and convert the regionName to the target region
if (regionName.Contains(".") && regionName.Contains(":"))
{
-// List regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
+ World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
+// List regions = World.GridService.GetRegionsByName(World.RegionInfo.ScopeID, regionName, 1);
+
string[] parts = regionName.Split(new char[] { ':' });
if (parts.Length > 2)
regionName = parts[0] + ':' + parts[1] + "/ " + parts[2];
--
cgit v1.1
From f5a3eb9fd547df043b00a2934d891dcfff3142ab Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Feb 2011 17:05:45 -0800
Subject: Added a config var to HGInventoryAccessModule called
OutboundPermission that controls whether the sim lets asset POSTs happen to
foreign grids or not. It's True by default. If ppl want to allow foreign
visitors but don't want to allow any assets out of their grid, they should
set this to False. This is the beginning of policies for these things...
---
.../Framework/InventoryAccess/HGInventoryAccessModule.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 34b8114..4565d10 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
}
private string m_ProfileServerURI;
+ private bool m_OutboundPermission;
// private bool m_Initialized = false;
@@ -78,7 +79,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
IConfig thisModuleConfig = source.Configs["HGInventoryAccessModule"];
if (thisModuleConfig != null)
+ {
m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
+ m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
+ }
else
m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
}
@@ -103,7 +107,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel)
{
string userAssetServer = string.Empty;
- if (IsForeignUser(avatarID, out userAssetServer))
+ if (IsForeignUser(avatarID, out userAssetServer) && m_OutboundPermission)
{
Util.FireAndForget(delegate { m_assMapper.Post(assetID, avatarID, userAssetServer); });
}
@@ -197,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
if (IsForeignUser(sender, out userAssetServer))
m_assMapper.Get(item.AssetID, sender, userAssetServer);
- if (IsForeignUser(receiver, out userAssetServer))
+ if (IsForeignUser(receiver, out userAssetServer) && m_OutboundPermission)
m_assMapper.Post(item.AssetID, receiver, userAssetServer);
}
--
cgit v1.1
From 632babf8fba8180764b359b9716eaac904b1b4ac Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 4 Feb 2011 19:19:38 -0800
Subject: Added an additional debug message, and removed a bunch of files that
weren't being used anymore -- the old RemotsInventory connectors stuff.
---
.../Inventory/HGInventoryBroker.cs | 5 +
.../Inventory/RemoteInventoryServiceConnector.cs | 362 ---------------------
2 files changed, 5 insertions(+), 362 deletions(-)
delete mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 39410b5..3f63db3 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -200,6 +200,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
return;
}
}
+ else
+ {
+ m_log.DebugFormat("[HG INVENTORY CONNECTOR]: User {0} does not have InventoryServerURI. OH NOES!", userID);
+ return;
+ }
}
}
}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
deleted file mode 100644
index 9213132..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ /dev/null
@@ -1,362 +0,0 @@
-/*
- * 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 log4net;
-using System;
-using System.Collections.Generic;
-using System.Reflection;
-using Nini.Config;
-using OpenSim.Framework;
-using OpenSim.Framework.Statistics;
-using OpenSim.Services.Connectors;
-using OpenSim.Region.Framework.Interfaces;
-using OpenSim.Region.Framework.Scenes;
-using OpenSim.Services.Interfaces;
-using OpenMetaverse;
-
-namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
-{
- public class RemoteInventoryServicesConnector : BaseInventoryConnector, ISharedRegionModule, IInventoryService
- {
- private static readonly ILog m_log =
- LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
- private bool m_Enabled = false;
- private bool m_Initialized = false;
- private Scene m_Scene;
- private InventoryServicesConnector m_RemoteConnector;
-
- private IUserManagement m_UserManager;
- private IUserManagement UserManager
- {
- get
- {
- if (m_UserManager == null)
- {
- m_UserManager = m_Scene.RequestModuleInterface();
- }
- return m_UserManager;
- }
- }
-
-
- public Type ReplaceableInterface
- {
- get { return null; }
- }
-
- public string Name
- {
- get { return "RemoteInventoryServicesConnector"; }
- }
-
- public RemoteInventoryServicesConnector()
- {
- }
-
- public RemoteInventoryServicesConnector(IConfigSource source)
- {
- Init(source);
- }
-
- protected override void Init(IConfigSource source)
- {
- m_RemoteConnector = new InventoryServicesConnector(source);
- base.Init(source);
- }
-
- #region ISharedRegionModule
-
- public void Initialise(IConfigSource source)
- {
- IConfig moduleConfig = source.Configs["Modules"];
- if (moduleConfig != null)
- {
- string name = moduleConfig.GetString("InventoryServices", "");
- if (name == Name)
- {
- Init(source);
- m_Enabled = true;
-
- m_log.Info("[INVENTORY CONNECTOR]: Remote inventory enabled");
- }
- }
- }
-
- public void PostInitialise()
- {
- }
-
- public void Close()
- {
- }
-
- public void AddRegion(Scene scene)
- {
-// m_Scene = scene;
- //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName);
-
- if (!m_Enabled)
- return;
-
- if (!m_Initialized)
- {
- m_Initialized = true;
- }
-
- scene.RegisterModuleInterface(this);
- m_cache.AddRegion(scene);
-
- if (m_Scene == null)
- m_Scene = scene;
- }
-
- public void RemoveRegion(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- m_cache.RemoveRegion(scene);
- }
-
- public void RegionLoaded(Scene scene)
- {
- if (!m_Enabled)
- return;
-
- m_log.InfoFormat("[INVENTORY CONNECTOR]: Enabled remote inventory for region {0}", scene.RegionInfo.RegionName);
-
- }
-
- #endregion ISharedRegionModule
-
- #region IInventoryService
-
- public override bool CreateUserInventory(UUID user)
- {
- return false;
- }
-
- public override List GetInventorySkeleton(UUID userId)
- {
- return new List();
- }
-
- public override InventoryCollection GetUserInventory(UUID userID)
- {
- return null;
- }
-
- public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
- {
- UUID sessionID = GetSessionID(userID);
- try
- {
- m_RemoteConnector.GetUserInventory(userID.ToString(), sessionID, callback);
- }
- catch (Exception e)
- {
- if (StatsManager.SimExtraStats != null)
- StatsManager.SimExtraStats.AddInventoryServiceRetrievalFailure();
-
- m_log.ErrorFormat("[INVENTORY CONNECTOR]: Request inventory operation failed, {0} {1}",
- e.Source, e.Message);
- }
-
- }
-
- // inherited. See base class
- // public InventoryFolderBase GetFolderForType(UUID userID, AssetType type)
-
- public override Dictionary GetSystemFolders(UUID userID)
- {
- UUID sessionID = GetSessionID(userID);
- return m_RemoteConnector.GetSystemFolders(userID.ToString(), sessionID);
- }
-
- public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
- {
- UUID sessionID = GetSessionID(userID);
- try
- {
- InventoryCollection invCol = m_RemoteConnector.GetFolderContent(userID.ToString(), folderID, sessionID);
- foreach (InventoryItemBase item in invCol.Items)
- UserManager.AddUser(item.CreatorIdAsUuid, item.CreatorData);
- return invCol;
- }
- catch (Exception e)
- {
- m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation failed, {0} {1}",
- e.Source, e.Message);
- }
- InventoryCollection nullCollection = new InventoryCollection();
- nullCollection.Folders = new List();
- nullCollection.Items = new List();
- nullCollection.UserID = userID;
- return nullCollection;
- }
-
- public override List GetFolderItems(UUID userID, UUID folderID)
- {
- UUID sessionID = GetSessionID(userID);
- return m_RemoteConnector.GetFolderItems(userID.ToString(), folderID, sessionID);
- }
-
- public override bool AddFolder(InventoryFolderBase folder)
- {
- if (folder == null)
- return false;
-
- UUID sessionID = GetSessionID(folder.Owner);
- return m_RemoteConnector.AddFolder(folder.Owner.ToString(), folder, sessionID);
- }
-
- public override bool UpdateFolder(InventoryFolderBase folder)
- {
- if (folder == null)
- return false;
-
- UUID sessionID = GetSessionID(folder.Owner);
- return m_RemoteConnector.UpdateFolder(folder.Owner.ToString(), folder, sessionID);
- }
-
- public override bool MoveFolder(InventoryFolderBase folder)
- {
- if (folder == null)
- return false;
-
- UUID sessionID = GetSessionID(folder.Owner);
- return m_RemoteConnector.MoveFolder(folder.Owner.ToString(), folder, sessionID);
- }
-
- public override bool DeleteFolders(UUID ownerID, List folderIDs)
- {
- if (folderIDs == null)
- return false;
- if (folderIDs.Count == 0)
- return false;
-
- UUID sessionID = GetSessionID(ownerID);
- return m_RemoteConnector.DeleteFolders(ownerID.ToString(), folderIDs, sessionID);
- }
-
-
- public override bool PurgeFolder(InventoryFolderBase folder)
- {
- if (folder == null)
- return false;
-
- UUID sessionID = GetSessionID(folder.Owner);
- return m_RemoteConnector.PurgeFolder(folder.Owner.ToString(), folder, sessionID);
- }
-
- // public bool AddItem(InventoryItemBase item) inherited
- // Uses AddItemPlain
-
- protected override bool AddItemPlain(InventoryItemBase item)
- {
- if (item == null)
- return false;
-
- UUID sessionID = GetSessionID(item.Owner);
- return m_RemoteConnector.AddItem(item.Owner.ToString(), item, sessionID);
- }
-
- public override bool UpdateItem(InventoryItemBase item)
- {
- if (item == null)
- return false;
-
- UUID sessionID = GetSessionID(item.Owner);
- return m_RemoteConnector.UpdateItem(item.Owner.ToString(), item, sessionID);
- }
-
- public override bool MoveItems(UUID ownerID, List items)
- {
- if (items == null)
- return false;
-
- UUID sessionID = GetSessionID(ownerID);
- return m_RemoteConnector.MoveItems(ownerID.ToString(), items, sessionID);
- }
-
-
- public override bool DeleteItems(UUID ownerID, List itemIDs)
- {
- if (itemIDs == null)
- return false;
- if (itemIDs.Count == 0)
- return true;
-
- UUID sessionID = GetSessionID(ownerID);
- return m_RemoteConnector.DeleteItems(ownerID.ToString(), itemIDs, sessionID);
- }
-
- public override InventoryItemBase GetItem(InventoryItemBase item)
- {
- if (item == null)
- return null;
-
- UUID sessionID = GetSessionID(item.Owner);
- return m_RemoteConnector.QueryItem(item.Owner.ToString(), item, sessionID);
- }
-
- public override InventoryFolderBase GetFolder(InventoryFolderBase folder)
- {
- if (folder == null)
- return null;
-
- UUID sessionID = GetSessionID(folder.Owner);
- return m_RemoteConnector.QueryFolder(folder.Owner.ToString(), folder, sessionID);
- }
-
- public override bool HasInventoryForUser(UUID userID)
- {
- return false;
- }
-
- public override List GetActiveGestures(UUID userId)
- {
- return new List();
- }
-
- public override int GetAssetPermissions(UUID userID, UUID assetID)
- {
- UUID sessionID = GetSessionID(userID);
- return m_RemoteConnector.GetAssetPermissions(userID.ToString(), assetID, sessionID);
- }
-
-
- #endregion
-
- private UUID GetSessionID(UUID userID)
- {
- return UUID.Zero;
- }
-
- }
-}
--
cgit v1.1
From 67555994adc6b5449a0a1c21997e7bfcf880ad02 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 5 Feb 2011 07:55:54 -0800
Subject: Amend to yesterday's deletions: forgot to delete the RemoteInventory
module in th addin.xml file.
---
OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index 43de2ab..a9d247a 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -47,7 +47,6 @@
-
--
cgit v1.1
From b20ab1063f5717a69fb3226c44b4af5228280d35 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 5 Feb 2011 17:57:30 -0800
Subject: Added a couple of console commands to help diagnose issues: show
circuits: shows the lists of agent circuit data show http-handlers: shows the
currently registered http handlers
---
OpenSim/Region/Application/OpenSim.cs | 50 +++++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index ed4b620..bbcc588 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -294,6 +294,14 @@ namespace OpenSim
"show connections",
"Show connection data", HandleShow);
+ m_console.Commands.AddCommand("region", false, "show circuits",
+ "show circuits",
+ "Show agent circuit data", HandleShow);
+
+ m_console.Commands.AddCommand("region", false, "show http-handlers",
+ "show http-handlers",
+ "Show all registered http handlers", HandleShow);
+
m_console.Commands.AddCommand("region", false, "show modules",
"show modules",
"Show module data", HandleShow);
@@ -943,6 +951,48 @@ namespace OpenSim
MainConsole.Instance.Output(connections.ToString());
break;
+ case "circuits":
+ System.Text.StringBuilder acd = new System.Text.StringBuilder("Agent Circuits:\n");
+ m_sceneManager.ForEachScene(
+ delegate(Scene scene)
+ {
+ //this.HttpServer.
+ acd.AppendFormat("{0}:\n", scene.RegionInfo.RegionName);
+ foreach (AgentCircuitData aCircuit in scene.AuthenticateHandler.AgentCircuits.Values)
+ acd.AppendFormat("\t{0} {1} ({2})\n", aCircuit.firstname, aCircuit.lastname, (aCircuit.child ? "Child" : "Root"));
+ }
+ );
+
+ MainConsole.Instance.Output(acd.ToString());
+ break;
+
+ case "http-handlers":
+ System.Text.StringBuilder handlers = new System.Text.StringBuilder("Registered HTTP Handlers:\n");
+
+ handlers.AppendFormat("* XMLRPC:\n");
+ foreach (String s in HttpServer.GetXmlRpcHandlerKeys())
+ handlers.AppendFormat("\t{0}\n", s);
+
+ handlers.AppendFormat("* HTTP:\n");
+ List poll = HttpServer.GetPollServiceHandlerKeys();
+ foreach (String s in HttpServer.GetHTTPHandlerKeys())
+ handlers.AppendFormat("\t{0} {1}\n", s, (poll.Contains(s) ? "(poll service)" : string.Empty));
+
+ handlers.AppendFormat("* Agent:\n");
+ foreach (String s in HttpServer.GetAgentHandlerKeys())
+ handlers.AppendFormat("\t{0}\n", s);
+
+ handlers.AppendFormat("* LLSD:\n");
+ foreach (String s in HttpServer.GetLLSDHandlerKeys())
+ handlers.AppendFormat("\t{0}\n", s);
+
+ handlers.AppendFormat("* StreamHandlers ({0}):\n", HttpServer.GetStreamHandlerKeys().Count);
+ foreach (String s in HttpServer.GetStreamHandlerKeys())
+ handlers.AppendFormat("\t{0}\n", s);
+
+ MainConsole.Instance.Output(handlers.ToString());
+ break;
+
case "modules":
MainConsole.Instance.Output("The currently loaded shared modules are:");
foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
--
cgit v1.1
From 30fa5ad1e29df50de99611b43adfd577696bfdda Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 5 Feb 2011 19:21:12 -0800
Subject: One more diagnosis command: show caps
---
.../Agent/Capabilities/CapabilitiesModule.cs | 28 +++++++++++++++++++++-
1 file changed, 27 insertions(+), 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index c023a6f..75df6cc 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -26,12 +26,14 @@
*/
using System;
+using System.Collections;
using System.Collections.Generic;
using System.Reflection;
using log4net;
using Nini.Config;
using OpenMetaverse;
using OpenSim.Framework;
+using OpenSim.Framework.Console;
using OpenSim.Region.Framework.Interfaces;
using OpenSim.Region.Framework.Scenes;
using Caps=OpenSim.Framework.Capabilities.Caps;
@@ -61,6 +63,10 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
{
m_scene = scene;
m_scene.RegisterModuleInterface(this);
+ MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
+ "show capabilities",
+ "Shows all registered capabilities", CapabilitiesCommand);
+ m_log.Error("\n\n**************************************************************\n\n");
}
public void RegionLoaded(Scene scene)
@@ -72,7 +78,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
m_scene.UnregisterModuleInterface(this);
}
- public void PostInitialise() {}
+ public void PostInitialise()
+ {
+ }
public void Close() {}
@@ -226,5 +234,23 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
m_log.Info(" >> "+x+", "+y+": "+kvp.Value);
}
}
+
+ private void CapabilitiesCommand(string module, string[] cmdparams)
+ {
+ System.Text.StringBuilder caps = new System.Text.StringBuilder();
+ caps.AppendFormat("Region {0}:\n", m_scene.RegionInfo.RegionName);
+
+ foreach (KeyValuePair kvp in m_capsHandlers)
+ {
+ caps.AppendFormat("** User {0}:\n", kvp.Key);
+ for (IDictionaryEnumerator kvp2 = kvp.Value.CapsHandlers.CapsDetails.GetEnumerator(); kvp2.MoveNext(); )
+ {
+ Uri uri = new Uri(kvp2.Value.ToString());
+ caps.AppendFormat(" {0} = {1}\n", kvp2.Key, uri.PathAndQuery);
+ }
+ }
+
+ MainConsole.Instance.Output(caps.ToString());
+ }
}
}
--
cgit v1.1
From cc81d924cab97889538c20e9bfa45008ecfead3e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 5 Feb 2011 19:34:02 -0800
Subject: Fixed Caps handlers leak
---
OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs | 1 -
1 file changed, 1 deletion(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
index 75df6cc..1d8e70e 100644
--- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs
@@ -66,7 +66,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities
MainConsole.Instance.Commands.AddCommand("Capabilities", false, "show caps",
"show capabilities",
"Shows all registered capabilities", CapabilitiesCommand);
- m_log.Error("\n\n**************************************************************\n\n");
}
public void RegionLoaded(Scene scene)
--
cgit v1.1
From 3411d4867d01d4cf87f09300f69d149c5269c611 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sat, 5 Feb 2011 19:40:55 -0800
Subject: Honor check of m_Enabled in WorldViewModule.
---
OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs | 3 +++
1 file changed, 3 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
index d4b7020..cee8851 100644
--- a/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
+++ b/OpenSim/Region/OptionalModules/World/WorldView/WorldViewModule.cs
@@ -71,6 +71,9 @@ namespace OpenSim.Region.OptionalModules.World.WorldView
public void RegionLoaded(Scene scene)
{
+ if (!m_Enabled)
+ return;
+
m_Generator = scene.RequestModuleInterface();
if (m_Generator == null)
{
--
cgit v1.1
From 2c7e87c45bb0d543ba0ab9342a1bc29f92fb4fd3 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 6 Feb 2011 07:51:20 -0800
Subject: Better output for show neighbours
---
.../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 023a44c..3c36799 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -247,13 +247,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
public void NeighboursCommand(string module, string[] cmdparams)
{
+ System.Text.StringBuilder caps = new System.Text.StringBuilder();
+
foreach (KeyValuePair kvp in m_LocalCache)
{
- m_log.InfoFormat("*** Neighbours of {0} {1} ***", kvp.Key, kvp.Value.RegionName);
+ caps.AppendFormat("*** Neighbours of {0} ({1}) ***\n", kvp.Value.RegionName, kvp.Key);
List regions = kvp.Value.GetNeighbours();
foreach (GridRegion r in regions)
- m_log.InfoFormat(" {0} @ {1}={2}", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
+ caps.AppendFormat(" {0} @ {1}-{2}\n", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
}
+
+ MainConsole.Instance.Output(caps.ToString());
}
}
--
cgit v1.1
From 98ea78fc77b3dd6da185d71dfab402a0ef8780d6 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Sun, 6 Feb 2011 19:39:29 -0800
Subject: New command: show pending-objects
---
OpenSim/Region/Application/OpenSim.cs | 22 ++++++++++++++++++++++
.../Region/Framework/Interfaces/ISceneViewer.cs | 1 +
OpenSim/Region/Framework/Scenes/SceneViewer.cs | 8 ++++++++
3 files changed, 31 insertions(+)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index bbcc588..bd1aa46 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -302,6 +302,10 @@ namespace OpenSim
"show http-handlers",
"Show all registered http handlers", HandleShow);
+ m_console.Commands.AddCommand("region", false, "show pending-objects",
+ "show pending-objects",
+ "Show # of objects on the pending queues of all scene viewers", HandleShow);
+
m_console.Commands.AddCommand("region", false, "show modules",
"show modules",
"Show module data", HandleShow);
@@ -993,6 +997,24 @@ namespace OpenSim
MainConsole.Instance.Output(handlers.ToString());
break;
+ case "pending-objects":
+ System.Text.StringBuilder pending = new System.Text.StringBuilder("Pending objects:\n");
+ m_sceneManager.ForEachScene(
+ delegate(Scene scene)
+ {
+ scene.ForEachScenePresence(
+ delegate(ScenePresence sp)
+ {
+ pending.AppendFormat("{0}: {1} {2} pending\n",
+ scene.RegionInfo.RegionName, sp.Name, sp.SceneViewer.GetPendingObjectsCount());
+ }
+ );
+ }
+ );
+
+ MainConsole.Instance.Output(pending.ToString());
+ break;
+
case "modules":
MainConsole.Instance.Output("The currently loaded shared modules are:");
foreach (IRegionModule module in m_moduleLoader.GetLoadedSharedModules)
diff --git a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
index 7251d57..2397f22 100644
--- a/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
+++ b/OpenSim/Region/Framework/Interfaces/ISceneViewer.cs
@@ -36,5 +36,6 @@ namespace OpenSim.Region.Framework.Interfaces
void Close();
void QueuePartForUpdate(SceneObjectPart part);
void SendPrimUpdates();
+ int GetPendingObjectsCount();
}
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index b44a010..7c067ca 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -205,6 +205,14 @@ namespace OpenSim.Region.Framework.Scenes
Reset();
}
+ public int GetPendingObjectsCount()
+ {
+ if (m_pendingObjects != null)
+ return m_pendingObjects.Count;
+
+ return 0;
+ }
+
public class ScenePartUpdate
{
public UUID FullID;
--
cgit v1.1
From ebeef02fef1a04b5b4cfe13dad588bcce7f9ba21 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Mon, 7 Feb 2011 07:45:03 -0800
Subject: Hunting down mantis #5365 Revert "refactor: remove redundant null
checks"
This reverts commit 6e58996b4d9db202cd7795a37bd687362effef48.
---
.../LindenUDP/UnackedPacketCollection.cs | 45 ++++++++++++++--------
1 file changed, 30 insertions(+), 15 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
index 9d40688..d762bef 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs
@@ -141,31 +141,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
private void ProcessQueues()
{
// Process all the pending adds
+
OutgoingPacket pendingAdd;
- while (m_pendingAdds.TryDequeue(out pendingAdd))
- m_packets[pendingAdd.SequenceNumber] = pendingAdd;
+ if (m_pendingAdds != null)
+ {
+ while (m_pendingAdds.TryDequeue(out pendingAdd))
+ {
+ if (pendingAdd != null && m_packets != null)
+ {
+ m_packets[pendingAdd.SequenceNumber] = pendingAdd;
+ }
+ }
+ }
// Process all the pending removes, including updating statistics and round-trip times
PendingAck pendingRemove;
OutgoingPacket ackedPacket;
- while (m_pendingRemoves.TryDequeue(out pendingRemove))
+ if (m_pendingRemoves != null)
{
- if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
+ while (m_pendingRemoves.TryDequeue(out pendingRemove))
{
- m_packets.Remove(pendingRemove.SequenceNumber);
-
- // Update stats
- Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
-
- if (!pendingRemove.FromResend)
+ if (m_pendingRemoves != null && m_packets != null)
{
- // Calculate the round-trip time for this packet and its ACK
- int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
- if (rtt > 0)
- ackedPacket.Client.UpdateRoundTrip(rtt);
+ if (m_packets.TryGetValue(pendingRemove.SequenceNumber, out ackedPacket))
+ {
+ m_packets.Remove(pendingRemove.SequenceNumber);
+
+ // Update stats
+ Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength);
+
+ if (!pendingRemove.FromResend)
+ {
+ // Calculate the round-trip time for this packet and its ACK
+ int rtt = pendingRemove.RemoveTime - ackedPacket.TickCount;
+ if (rtt > 0)
+ ackedPacket.Client.UpdateRoundTrip(rtt);
+ }
+ }
}
}
}
}
}
-}
\ No newline at end of file
+}
--
cgit v1.1
From 6becaf65e15e3fde2d910925b4f7ff09971121f3 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 7 Feb 2011 22:28:59 +0000
Subject: Fix merge issues
---
.../Avatar/Inventory/Archiver/InventoryArchiverModule.cs | 6 ------
.../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 11 -----------
2 files changed, 17 deletions(-)
(limited to 'OpenSim/Region')
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index 68538c9..a71def7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -128,11 +128,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
+ " is the user's last name." + Environment.NewLine
+ " is the path inside the user's inventory for the folder/item to be saved." + Environment.NewLine
+ "-p|--profile= adds the url of the profile service to the saved user information." + Environment.NewLine
-<<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
-=======
+ "-c|--creators preserves information about foreign creators." + Environment.NewLine
+ "-v|--verbose extra debug messages." + Environment.NewLine
->>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+ " is the filesystem path at which to save the IAR."
+ string.Format(" If this is not given then the filename {0} in the current directory is used", DEFAULT_INV_BACKUP_FILENAME),
HandleSaveInvConsoleCommand);
@@ -399,11 +396,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
OptionSet ops = new OptionSet();
//ops.Add("v|version=", delegate(string v) { options["version"] = v; });
ops.Add("p|profile=", delegate(string v) { options["profile"] = v; });
-<<<<<<< HEAD:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
-=======
ops.Add("v|verbose", delegate(string v) { options["verbose"] = v; });
ops.Add("c|creators", delegate(string v) { options["creators"] = v; });
->>>>>>> master:OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
List mainParams = ops.Parse(cmdparams);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e6ebc6e..673ea46 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1917,14 +1917,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
protected void SetTexture(SceneObjectPart part, string texture, int face)
{
-<<<<<<< HEAD:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
if (part == null || part.ParentGroup == null || part.ParentGroup.IsDeleted)
return;
- UUID textureID=new UUID();
-=======
UUID textureID = new UUID();
->>>>>>> master:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
textureID = InventoryKey(texture, (int)AssetType.Texture);
if (textureID == UUID.Zero)
@@ -3346,15 +3342,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
msg.dialog = (byte)19; // MessageFromObject
msg.fromGroup = false;// fromGroup;
msg.offline = (byte)0; //offline;
-<<<<<<< HEAD:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
msg.ParentEstateID = World.RegionInfo.EstateSettings.EstateID;
msg.Position = new Vector3(m_host.AbsolutePosition);
msg.RegionID = World.RegionInfo.RegionID.Guid;
- msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
-=======
- msg.ParentEstateID = 0; //ParentEstateID;
- msg.Position = new Vector3(m_host.AbsolutePosition);
- msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
msg.binaryBucket
= Util.StringToBytes256(
"{0}/{1}/{2}/{3}",
@@ -3362,7 +3352,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
(int)Math.Floor(m_host.AbsolutePosition.X),
(int)Math.Floor(m_host.AbsolutePosition.Y),
(int)Math.Floor(m_host.AbsolutePosition.Z));
->>>>>>> master:OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
if (m_TransferModule != null)
{
--
cgit v1.1