From 5757afe7665543e8b3ed4a322a7d6e095dafcdb3 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 07:48:21 -0700 Subject: First pass at the heart surgery for grid services. Compiles and runs minimally. A few bugs to catch now. --- .../CoreModules/Avatar/Friends/FriendsModule.cs | 13 +- .../Avatar/InstantMessage/MessageTransferModule.cs | 8 +- .../Avatar/InstantMessage/PresenceModule.cs | 6 +- .../Framework/Services/RegionMapService.cs | 208 --------------------- .../CoreModules/Hypergrid/HGWorldMapModule.cs | 13 +- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 28 ++- .../Interregion/RESTInterregionComms.cs | 36 +++- .../Land/RemoteLandServiceConnector.cs | 3 +- .../Neighbour/RemoteNeighourServiceConnector.cs | 3 +- .../CoreModules/World/Land/LandManagementModule.cs | 26 ++- .../CoreModules/World/WorldMap/MapSearchModule.cs | 26 ++- .../CoreModules/World/WorldMap/WorldMapModule.cs | 94 +++++++--- 12 files changed, 192 insertions(+), 272 deletions(-) delete mode 100644 OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 49b2b5c..dd9b318 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -40,6 +40,7 @@ using OpenSim.Framework.Communications.Cache; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.Avatar.Friends { @@ -108,7 +109,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends private Dictionary m_scenes = new Dictionary(); private IMessageTransferModule m_TransferModule = null; - private IGridServices m_gridServices = null; + private IGridService m_gridServices = null; #region IRegionModule Members @@ -142,7 +143,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends if (m_scenes.Count > 0) { m_TransferModule = m_initialScene.RequestModuleInterface(); - m_gridServices = m_initialScene.CommsManager.GridService; + m_gridServices = m_initialScene.GridService; } if (m_TransferModule == null) m_log.Error("[FRIENDS]: Unable to find a message transfer module, friendship offers will not work"); @@ -171,7 +172,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends List tpdAway = new List(); // destRegionHandle is a region on another server - RegionInfo info = m_gridServices.RequestNeighbourInfo(destRegionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(destRegionHandle, out x, out y); + GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y); if (info != null) { string httpServer = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/presence_update_bulk"; @@ -223,7 +226,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends public bool TriggerTerminateFriend(ulong destRegionHandle, UUID agentID, UUID exFriendID) { // destRegionHandle is a region on another server - RegionInfo info = m_gridServices.RequestNeighbourInfo(destRegionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(destRegionHandle, out x, out y); + GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y); if (info == null) { m_log.WarnFormat("[OGS1 GRID SERVICES]: Couldn't find region {0}", destRegionHandle); diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 4495303..e5159b3 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs @@ -36,6 +36,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { @@ -497,7 +498,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { if (upd.AgentOnline) { - RegionInfo reginfo = m_Scenes[0].SceneGridService.RequestNeighbouringRegionInfo(upd.Handle); + uint x = 0, y = 0; + Utils.LongToUInts(upd.Handle, out x, out y); + GridRegion reginfo = m_Scenes[0].GridService.GetRegionByPosition(m_Scenes[0].RegionInfo.ScopeID, + (int)x, (int)y); if (reginfo != null) { Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im); @@ -559,7 +563,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage /// RegionInfo we pull the data out of to send the request to /// The Instant Message data Hashtable /// Bool if the message was successfully delivered at the other side. - protected virtual bool doIMSending(RegionInfo reginfo, Hashtable xmlrpcdata) + protected virtual bool doIMSending(GridRegion reginfo, Hashtable xmlrpcdata) { ArrayList SendParams = new ArrayList(); diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index ebd9a72..6daab44 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs @@ -35,6 +35,7 @@ using OpenMetaverse; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { @@ -171,7 +172,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { // TODO this is the old messaging-server protocol; only the regionHandle is available. // Fetch region-info to get the id - RegionInfo regionInfo = m_initialScene.RequestNeighbouringRegionInfo(info.regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(info.regionHandle, out x, out y); + GridRegion regionInfo = m_initialScene.GridService.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, + (int)x, (int)y); regionID = regionInfo.RegionID; } result[indices[i]] = new PresenceInfo(uuids[i], regionID); diff --git a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs b/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs deleted file mode 100644 index 8c92727..0000000 --- a/OpenSim/Region/CoreModules/Framework/Services/RegionMapService.cs +++ /dev/null @@ -1,208 +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 System; -using System.Collections; -using System.Collections.Generic; -using System.Net; -using System.Reflection; -using log4net; -using Nini.Config; -using OpenMetaverse; -using OpenSim.Data; -using OpenSim.Framework; -using OpenSim.Framework.Communications; -using OpenSim.Framework.Communications.Cache; -using OpenSim.Framework.Servers.HttpServer; -using OpenSim.Region.Framework.Interfaces; -using OpenSim.Region.Framework.Scenes; - -using Nwc.XmlRpc; - - -namespace OpenSim.Region.CoreModules.Framework.Services -{ - public class RegionMapService : IRegionModule - { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - private static bool initialized = false; - private static bool enabled = false; - - Scene m_scene; - //AssetService m_assetService; - - #region IRegionModule interface - - public void Initialise(Scene scene, IConfigSource config) - { - if (!initialized) - { - initialized = true; - m_scene = scene; - - // This module is only on for hypergrid mode - enabled = config.Configs["Startup"].GetBoolean("hypergrid", false); - } - } - - public void PostInitialise() - { - if (enabled) - { - m_log.Info("[RegionMapService]: Starting..."); - - //m_assetService = new AssetService(m_scene); - new GridService(m_scene); - } - } - - public void Close() - { - } - - public string Name - { - get { return "RegionMapService"; } - } - - public bool IsSharedModule - { - get { return true; } - } - - #endregion - - } - - public class GridService - { -// private IUserService m_userService; - private IGridServices m_gridService; - private bool m_doLookup = false; - - public bool DoLookup - { - get { return m_doLookup; } - set { m_doLookup = value; } - } - private static readonly ILog m_log - = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - - public GridService(Scene m_scene) - { - AddHandlers(m_scene); -// m_userService = m_scene.CommsManager.UserService; - m_gridService = m_scene.CommsManager.GridService; - } - - protected void AddHandlers(Scene m_scene) - { -// IAssetDataPlugin m_assetProvider -// = ((AssetServerBase)m_scene.CommsManager.AssetCache.AssetServer).AssetProviderPlugin; - - IHttpServer httpServer = MainServer.Instance; - httpServer.AddXmlRPCHandler("simulator_data_request", XmlRpcSimulatorDataRequestMethod); - //m_httpServer.AddXmlRPCHandler("map_block", XmlRpcMapBlockMethod); - //m_httpServer.AddXmlRPCHandler("search_for_region_by_name", XmlRpcSearchForRegionMethod); - - } - - /// - /// Returns an XML RPC response to a simulator profile request - /// - /// - /// - public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request, IPEndPoint remoteClient) - { - Hashtable requestData = (Hashtable)request.Params[0]; - Hashtable responseData = new Hashtable(); - RegionInfo simData = null; - if (requestData.ContainsKey("region_UUID")) - { - UUID regionID = new UUID((string)requestData["region_UUID"]); - simData = m_gridService.RequestNeighbourInfo(regionID); //.GetRegion(regionID); - if (simData == null) - { - m_log.WarnFormat("[HGGridService] didn't find region for regionID {0} from {1}", - regionID, request.Params.Count > 1 ? request.Params[1] : "unknwon source"); - } - } - else if (requestData.ContainsKey("region_handle")) - { - //CFK: The if/else below this makes this message redundant. - //CFK: m_log.Info("requesting data for region " + (string) requestData["region_handle"]); - ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]); - simData = m_gridService.RequestNeighbourInfo(regionHandle); //m_gridDBService.GetRegion(regionHandle); - if (simData == null) - { - m_log.WarnFormat("[HGGridService] didn't find region for regionHandle {0} from {1}", - regionHandle, request.Params.Count > 1 ? request.Params[1] : "unknwon source"); - } - } - else if (requestData.ContainsKey("region_name_search")) - { - string regionName = (string)requestData["region_name_search"]; - List regInfos = m_gridService.RequestNamedRegions(regionName, 1);//m_gridDBService.GetRegion(regionName); - if (regInfos != null) - simData = regInfos[0]; - - if (simData == null) - { - m_log.WarnFormat("[HGGridService] didn't find region for regionName {0} from {1}", - regionName, request.Params.Count > 1 ? request.Params[1] : "unknwon source"); - } - } - else m_log.Warn("[HGGridService] regionlookup without regionID, regionHandle or regionHame"); - - if (simData == null) - { - //Sim does not exist - responseData["error"] = "Sim does not exist"; - } - else - { - m_log.Debug("[HGGridService]: found " + (string)simData.RegionName + " regionHandle = " + - (string)requestData["region_handle"]); - responseData["sim_ip"] = simData.ExternalEndPoint.Address.ToString(); - responseData["sim_port"] = simData.ExternalEndPoint.Port.ToString(); - //responseData["server_uri"] = simData.serverURI; - responseData["http_port"] = simData.HttpPort.ToString(); - //responseData["remoting_port"] = simData.remotingPort.ToString(); - responseData["region_locx"] = simData.RegionLocX.ToString(); - responseData["region_locy"] = simData.RegionLocY.ToString(); - responseData["region_UUID"] = simData.RegionID.ToString(); - responseData["region_name"] = simData.RegionName; - responseData["region_secret"] = simData.regionSecret; - } - - XmlRpcResponse response = new XmlRpcResponse(); - response.Value = responseData; - return response; - } - - } -} diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index 6774060..9957e46 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs @@ -34,6 +34,7 @@ using OpenSim.Framework; using OpenSim.Region.CoreModules.World.WorldMap; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.Hypergrid { @@ -59,7 +60,17 @@ namespace OpenSim.Region.CoreModules.Hypergrid protected override void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) { - List mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4); + List mapBlocks = new List(); + List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, + (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, + (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); + + foreach (GridRegion r in regions) + { + MapBlockData block = new MapBlockData(); + MapBlockFromGridRegion(block, r); + mapBlocks.Add(block); + } // Different from super FillInMap(mapBlocks, minX, minY, maxX, maxY); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 0c2a835..b5bade6 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -47,7 +47,7 @@ using Nini.Config; namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid { - public class HGGridConnector : ISharedRegionModule, IGridService + public class HGGridConnector : ISharedRegionModule, IGridService, IHyperlinkService { private static readonly ILog m_log = LogManager.GetLogger( @@ -142,6 +142,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return; scene.RegisterModuleInterface(this); + scene.RegisterModuleInterface(this); } @@ -367,10 +368,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid } #endregion - #region Hyperlinks + #region IHyperlinkService private static Random random = new Random(); + public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc) { string host = "127.0.0.1"; @@ -417,6 +419,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return null; } + // From the map search and secondlife://blah public GridRegion TryLinkRegion(Scene m_scene, IClientAPI client, string mapName) { @@ -554,6 +557,27 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return true; } + public GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor) + { + return TryLinkRegion((Scene)client.Scene, client, regionDescriptor); + } + + public GridRegion GetHyperlinkRegion(ulong handle) + { + foreach (GridRegion r in m_HyperlinkRegions.Values) + if (r.RegionHandle == handle) + return r; + return null; + } + + public ulong FindRegionHandle(ulong handle) + { + foreach (GridRegion r in m_HyperlinkRegions.Values) + if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID))) + return m_HyperlinkHandles[r.RegionID]; + return 0; + } + #endregion } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index 9519e23..f27b2f9 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs @@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes.Hypergrid; using OpenSim.Region.Framework.Scenes.Serialization; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion { @@ -161,7 +162,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { m_regionClient.SendUserInformation(regInfo, aCircuit); @@ -183,7 +186,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData); @@ -204,7 +209,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData); @@ -225,7 +232,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { return m_regionClient.DoRetrieveRootAgentCall(regInfo, id, out agent); @@ -257,7 +266,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { return m_regionClient.DoCloseAgentCall(regInfo, id); @@ -284,7 +295,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion // else do the remote thing if (!m_localBackend.IsLocalRegion(regionHandle)) { - RegionInfo regInfo = m_commsManager.GridService.RequestNeighbourInfo(regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionHandle, out x, out y); + GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); if (regInfo != null) { return m_regionClient.DoCreateObjectCall( @@ -798,13 +811,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion return false; } - public override void SendUserInformation(RegionInfo regInfo, AgentCircuitData aCircuit) + public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit) { try { if (m_aScene.SceneGridService is HGSceneCommunicationService) { - ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.SendUserInformation(regInfo, aCircuit); + // big hack for now + RegionInfo r = new RegionInfo(); + r.ExternalHostName = regInfo.ExternalHostName; + r.HttpPort = regInfo.HttpPort; + r.RegionID = regInfo.RegionID; + r.RegionLocX = (uint)regInfo.RegionLocX; + r.RegionLocY = (uint)regInfo.RegionLocY; + ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.SendUserInformation(r, aCircuit); } } catch // Bad cast diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs index a52c70b..b0ace39 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Land/RemoteLandServiceConnector.cs @@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; using OpenSim.Server.Base; + namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land { public class RemoteLandServicesConnector : @@ -89,7 +90,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Land if (!m_Enabled) return; - m_MapService = scene.CommsManager.GridService; + m_GridService = scene.GridService; m_LocalService.AddRegion(scene); scene.RegisterModuleInterface(this); } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index c5bc03b..912c393 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs @@ -118,7 +118,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour if (!m_Enabled) return; - m_MapService = scene.CommsManager.GridService; m_LocalService.AddRegion(scene); scene.RegisterModuleInterface(this); } @@ -134,6 +133,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour if (!m_Enabled) return; + m_GridService = scene.GridService; + m_log.InfoFormat("[NEIGHBOUR CONNECTOR]: Enabled remote neighbours for region {0}", scene.RegionInfo.RegionName); } diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs index 76ff6da..fdff61e 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs @@ -36,10 +36,12 @@ using OpenSim.Framework; using OpenSim.Framework.Capabilities; using OpenSim.Framework.Servers; using OpenSim.Framework.Servers.HttpServer; +using OpenSim.Services.Interfaces; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Physics.Manager; using Caps=OpenSim.Framework.Capabilities.Caps; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.World.Land { @@ -1301,7 +1303,7 @@ namespace OpenSim.Region.CoreModules.World.Land else { // a parcel request for a parcel in another region. Ask the grid about the region - RegionInfo info = m_scene.CommsManager.GridService.RequestNeighbourInfo(regionID); + GridRegion info = m_scene.GridService.GetRegionByUUID(UUID.Zero, regionID); if (info != null) parcelID = Util.BuildFakeParcelID(info.RegionHandle, x, y); } @@ -1359,9 +1361,10 @@ namespace OpenSim.Region.CoreModules.World.Land } else { - extLandData.landData = m_scene.CommsManager.GridService.RequestLandData(extLandData.regionHandle, - extLandData.x, - extLandData.y); + ILandService landService = m_scene.RequestModuleInterface(); + extLandData.landData = landService.GetLandData(extLandData.regionHandle, + extLandData.x, + extLandData.y); if (extLandData.landData == null) { // we didn't find the region/land => don't cache @@ -1373,20 +1376,27 @@ namespace OpenSim.Region.CoreModules.World.Land if (data != null) // if we found some data, send it { - RegionInfo info; + GridRegion info; if (data.regionHandle == m_scene.RegionInfo.RegionHandle) { - info = m_scene.RegionInfo; + info = new GridRegion(m_scene.RegionInfo); } else { // most likely still cached from building the extLandData entry - info = m_scene.CommsManager.GridService.RequestNeighbourInfo(data.regionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(data.regionHandle, out x, out y); + info = m_scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y); } // we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark. m_log.DebugFormat("[LAND] got parcelinfo for parcel {0} in region {1}; sending...", data.landData.Name, data.regionHandle); - remoteClient.SendParcelInfo(info, data.landData, parcelID, data.x, data.y); + // HACK for now + RegionInfo r = new RegionInfo(); + r.RegionName = info.RegionName; + r.RegionLocX = (uint)info.RegionLocX; + r.RegionLocY = (uint)info.RegionLocY; + remoteClient.SendParcelInfo(r, data.landData, parcelID, data.x, data.y); } else m_log.Debug("[LAND] got no parcelinfo; not sending"); diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index 4783b35..e3661fa 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs @@ -33,6 +33,8 @@ using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes.Hypergrid; +using OpenSim.Services.Interfaces; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.World.WorldMap { @@ -92,13 +94,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap } // try to fetch from GridServer - List regionInfos = m_scene.SceneGridService.RequestNamedRegions(mapName, 20); + List regionInfos = m_scene.GridService.GetRegionsByName(UUID.Zero, mapName, 20); if (regionInfos == null) { m_log.Warn("[MAPSEARCHMODULE]: RequestNamedRegions returned null. Old gridserver?"); // service wasn't available; maybe still an old GridServer. Try the old API, though it will return only one region - regionInfos = new List(); - RegionInfo info = m_scene.SceneGridService.RequestClosestRegion(mapName); + regionInfos = new List(); + GridRegion info = m_scene.GridService.GetRegionByName(UUID.Zero, mapName); if (info != null) regionInfos.Add(info); } @@ -109,11 +111,15 @@ namespace OpenSim.Region.CoreModules.World.WorldMap if (mapName.Contains(".") && mapName.Contains(":")) { // It probably is a domain name. Try to link to it. - RegionInfo regInfo; + GridRegion regInfo; Scene cScene = GetClientScene(remoteClient); - regInfo = HGHyperlink.TryLinkRegion(cScene, remoteClient, mapName); - if (regInfo != null) - regionInfos.Add(regInfo); + IHyperlinkService hyperService = cScene.RequestModuleInterface(); + if (hyperService != null) + { + regInfo = hyperService.TryLinkRegion(remoteClient, mapName); + if (regInfo != null) + regionInfos.Add(regInfo); + } } } @@ -122,12 +128,12 @@ namespace OpenSim.Region.CoreModules.World.WorldMap MapBlockData data; if (regionInfos.Count > 0) { - foreach (RegionInfo info in regionInfos) + foreach (GridRegion info in regionInfos) { data = new MapBlockData(); data.Agents = 0; - data.Access = info.AccessLevel; - data.MapImageId = info.RegionSettings.TerrainImageID; + data.Access = info.Access; + data.MapImageId = info.TerrainImage; data.Name = info.RegionName; data.RegionFlags = 0; // TODO not used? data.WaterHeight = 0; // not used diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index 1f25f28..bd12218 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -48,6 +48,7 @@ using OpenSim.Region.Framework.Scenes; using Caps=OpenSim.Framework.Capabilities.Caps; using OSDArray=OpenMetaverse.StructuredData.OSDArray; using OSDMap=OpenMetaverse.StructuredData.OSDMap; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.World.WorldMap { @@ -232,10 +233,20 @@ namespace OpenSim.Region.CoreModules.World.WorldMap } if (lookup) { - List mapBlocks; - - mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks((int)m_scene.RegionInfo.RegionLocX - 8, (int)m_scene.RegionInfo.RegionLocY - 8, (int)m_scene.RegionInfo.RegionLocX + 8, (int)m_scene.RegionInfo.RegionLocY + 8); - avatarPresence.ControllingClient.SendMapBlock(mapBlocks,0); + List mapBlocks = new List(); ; + + List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, + (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); + foreach (GridRegion r in regions) + { + MapBlockData block = new MapBlockData(); + MapBlockFromGridRegion(block, r); + mapBlocks.Add(block); + } + avatarPresence.ControllingClient.SendMapBlock(mapBlocks, 0); lock (cachedMapBlocks) cachedMapBlocks = mapBlocks; @@ -579,7 +590,9 @@ namespace OpenSim.Region.CoreModules.World.WorldMap } if (httpserver.Length == 0) { - RegionInfo mreg = m_scene.SceneGridService.RequestNeighbouringRegionInfo(regionhandle); + uint x = 0, y = 0; + Utils.LongToUInts(regionhandle, out x, out y); + GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y); if (mreg != null) { @@ -719,15 +732,23 @@ namespace OpenSim.Region.CoreModules.World.WorldMap { List response = new List(); - // this should return one mapblock at most. But make sure: Look whether the one we requested is in there - List mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX, minY, maxX, maxY); - if (mapBlocks != null) + // this should return one mapblock at most. + // (diva note: why?? in that case we should GetRegionByPosition) + // But make sure: Look whether the one we requested is in there + List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, + minX * (int)Constants.RegionSize, minY * (int)Constants.RegionSize, + maxX * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize); + + if (regions != null) { - foreach (MapBlockData block in mapBlocks) + foreach (GridRegion r in regions) { - if (block.X == minX && block.Y == minY) + if ((r.RegionLocX == minX * (int)Constants.RegionSize) && + (r.RegionLocY == minY * (int)Constants.RegionSize)) { // found it => add it to response + MapBlockData block = new MapBlockData(); + MapBlockFromGridRegion(block, r); response.Add(block); break; } @@ -754,10 +775,28 @@ namespace OpenSim.Region.CoreModules.World.WorldMap protected virtual void GetAndSendBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY, uint flag) { - List mapBlocks = m_scene.SceneGridService.RequestNeighbourMapBlocks(minX - 4, minY - 4, maxX + 4, maxY + 4); + List mapBlocks = new List(); + List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, + (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, + (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); + foreach (GridRegion r in regions) + { + MapBlockData block = new MapBlockData(); + MapBlockFromGridRegion(block, r); + mapBlocks.Add(block); + } remoteClient.SendMapBlock(mapBlocks, flag); } + protected void MapBlockFromGridRegion(MapBlockData block, GridRegion r) + { + block.Access = r.Access; + block.MapImageId = r.TerrainImage; + block.Name = r.RegionName; + block.X = (ushort)(r.RegionLocX / Constants.RegionSize); + block.Y = (ushort)(r.RegionLocY / Constants.RegionSize); + } + public Hashtable OnHTTPGetMapImage(Hashtable keysvals) { m_log.Debug("[WORLD MAP]: Sending map image jpeg"); @@ -874,31 +913,34 @@ namespace OpenSim.Region.CoreModules.World.WorldMap m_log.InfoFormat( "[WORLD MAP]: Exporting world map for {0} to {1}", m_scene.RegionInfo.RegionName, exportPath); - List mapBlocks = - m_scene.CommsManager.GridService.RequestNeighbourMapBlocks( - (int)(m_scene.RegionInfo.RegionLocX - 9), - (int)(m_scene.RegionInfo.RegionLocY - 9), - (int)(m_scene.RegionInfo.RegionLocX + 9), - (int)(m_scene.RegionInfo.RegionLocY + 9)); + List mapBlocks = new List(); + List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, + (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); List textures = new List(); List bitImages = new List(); - foreach (MapBlockData mapBlock in mapBlocks) + foreach (GridRegion r in regions) { + MapBlockData mapBlock = new MapBlockData(); + MapBlockFromGridRegion(mapBlock, r); AssetBase texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); if (texAsset != null) { textures.Add(texAsset); } - else - { - texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); - if (texAsset != null) - { - textures.Add(texAsset); - } - } + //else + //{ + // // WHAT?!? This doesn't seem right. Commenting (diva) + // texAsset = m_scene.AssetService.Get(mapBlock.MapImageId.ToString()); + // if (texAsset != null) + // { + // textures.Add(texAsset); + // } + //} } foreach (AssetBase asset in textures) -- cgit v1.1 From d39e67d5b2ca974e7e2506bcb717ec25ae061e75 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 08:06:14 -0700 Subject: More redirects to HGGridConnector-as-HyperlinkService. --- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 5 ++++- .../Interregion/RESTInterregionComms.cs | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index b5bade6..66cde91 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -567,6 +567,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid foreach (GridRegion r in m_HyperlinkRegions.Values) if (r.RegionHandle == handle) return r; + foreach (GridRegion r in m_knownRegions.Values) + if (r.RegionHandle == handle) + return r; return null; } @@ -575,7 +578,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid foreach (GridRegion r in m_HyperlinkRegions.Values) if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID))) return m_HyperlinkHandles[r.RegionID]; - return 0; + return handle; } #endregion diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index f27b2f9..adf747a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs @@ -42,6 +42,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Scenes.Hypergrid; using OpenSim.Region.Framework.Scenes.Serialization; +using OpenSim.Services.Interfaces; using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion @@ -60,6 +61,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion protected RegionToRegionClient m_regionClient; + protected IHyperlinkService m_hyperlinkService; + protected bool m_safemode; protected IPAddress m_thisIP; @@ -135,7 +138,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion m_localBackend = new LocalInterregionComms(); m_commsManager = scene.CommsManager; m_aScene = scene; - m_regionClient = new RegionToRegionClient(m_aScene); + m_hyperlinkService = m_aScene.RequestModuleInterface(); + m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService); m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName); } @@ -789,16 +793,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion protected class RegionToRegionClient : RegionClient { Scene m_aScene = null; + IHyperlinkService m_hyperlinkService; - public RegionToRegionClient(Scene s) + public RegionToRegionClient(Scene s, IHyperlinkService hyperService) { m_aScene = s; + m_hyperlinkService = hyperService; } public override ulong GetRegionHandle(ulong handle) { if (m_aScene.SceneGridService is HGSceneCommunicationService) - return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.FindRegionHandle(handle); + { + if (m_hyperlinkService != null) + return m_hyperlinkService.FindRegionHandle(handle); + } return handle; } @@ -806,8 +815,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion public override bool IsHyperlink(ulong handle) { if (m_aScene.SceneGridService is HGSceneCommunicationService) - return ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.IsHyperlinkRegion(handle); - + { + if ((m_hyperlinkService != null) && (m_hyperlinkService.GetHyperlinkRegion(handle) != null)) + return true; + } return false; } -- cgit v1.1 From 632bb7126277b6e8b524b76fb181a079b51adcf4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 08:49:48 -0700 Subject: Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional. Also fixed the notification of the message server in standalone -- that server doesn't usually exist. --- .../CoreModules/Avatar/InstantMessage/PresenceModule.cs | 12 ++++++++++++ OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 6daab44..5a9b452 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs @@ -330,6 +330,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private void NotifyMessageServerOfStartup(Scene scene) { + if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) + return; + Hashtable xmlrpcdata = new Hashtable(); xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); ArrayList SendParams = new ArrayList(); @@ -353,6 +356,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private void NotifyMessageServerOfShutdown(Scene scene) { + if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) + return; + Hashtable xmlrpcdata = new Hashtable(); xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); ArrayList SendParams = new ArrayList(); @@ -376,6 +382,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) { + if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) + return; + Hashtable xmlrpcdata = new Hashtable(); xmlrpcdata["AgentID"] = agentID.ToString(); xmlrpcdata["RegionUUID"] = region.ToString(); @@ -401,6 +410,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) { + if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) + return; + Hashtable xmlrpcdata = new Hashtable(); xmlrpcdata["AgentID"] = agentID.ToString(); xmlrpcdata["RegionUUID"] = region.ToString(); diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs index 9957e46..a0ccdc7 100644 --- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs +++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs @@ -62,8 +62,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid { List mapBlocks = new List(); List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, - (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, - (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); + (minX - 4) * (int)Constants.RegionSize, (maxX + 4) * (int)Constants.RegionSize, + (minY - 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); foreach (GridRegion r in regions) { -- cgit v1.1 From b5163889b915c4405bdd266d32bcaf39aaf8079f Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 10:30:45 -0700 Subject: Fixed the order of params to GetRegionRange. --- .../Region/CoreModules/World/WorldMap/WorldMapModule.cs | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs index bd12218..05ed70a 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs @@ -237,8 +237,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, (int)(m_scene.RegionInfo.RegionLocX - 8) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, (int)(m_scene.RegionInfo.RegionLocX + 8) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 8) * (int)Constants.RegionSize, (int)(m_scene.RegionInfo.RegionLocY + 8) * (int)Constants.RegionSize); foreach (GridRegion r in regions) { @@ -736,8 +736,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap // (diva note: why?? in that case we should GetRegionByPosition) // But make sure: Look whether the one we requested is in there List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, - minX * (int)Constants.RegionSize, minY * (int)Constants.RegionSize, - maxX * (int)Constants.RegionSize, maxY * (int)Constants.RegionSize); + minX * (int)Constants.RegionSize, + maxX * (int)Constants.RegionSize, + minY * (int)Constants.RegionSize, + maxY * (int)Constants.RegionSize); if (regions != null) { @@ -777,8 +779,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap { List mapBlocks = new List(); List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, - (minX - 4) * (int)Constants.RegionSize, (minY - 4) * (int)Constants.RegionSize, - (maxX + 4) * (int)Constants.RegionSize, (maxY + 4) * (int)Constants.RegionSize); + (minX - 4) * (int)Constants.RegionSize, + (maxX + 4) * (int)Constants.RegionSize, + (minY - 4) * (int)Constants.RegionSize, + (maxY + 4) * (int)Constants.RegionSize); foreach (GridRegion r in regions) { MapBlockData block = new MapBlockData(); @@ -916,8 +920,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap List mapBlocks = new List(); List regions = m_scene.GridService.GetRegionRange(m_scene.RegionInfo.ScopeID, (int)(m_scene.RegionInfo.RegionLocX - 9) * (int)Constants.RegionSize, - (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, (int)(m_scene.RegionInfo.RegionLocX + 9) * (int)Constants.RegionSize, + (int)(m_scene.RegionInfo.RegionLocY - 9) * (int)Constants.RegionSize, (int)(m_scene.RegionInfo.RegionLocY + 9) * (int)Constants.RegionSize); List textures = new List(); List bitImages = new List(); -- cgit v1.1 From dcfd08b8dd57e667db8e0b5900da4648a020160e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 11:01:18 -0700 Subject: Fixed a bug with link-region. --- .../Grid/HypergridServiceInConnectorModule.cs | 5 ++-- .../ServiceConnectorsOut/Grid/HGCommands.cs | 6 ++--- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 31 ++++++---------------- 3 files changed, 14 insertions(+), 28 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 4fbee7f..41f96b3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs @@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Server.Base; using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Grid; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid { @@ -106,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid //ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); } - SimpleRegionInfo rinfo = new SimpleRegionInfo(scene.RegionInfo); + GridRegion rinfo = new GridRegion(scene.RegionInfo); m_HypergridHandler.AddRegion(rinfo); } @@ -115,7 +116,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid if (!m_Enabled) return; - SimpleRegionInfo rinfo = new SimpleRegionInfo(scene.RegionInfo); + GridRegion rinfo = new GridRegion(scene.RegionInfo); m_HypergridHandler.RemoveRegion(rinfo); } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs index 36915ef..0974372 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs @@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private void RunHGCommand(string command, string[] cmdparams) { - if (command.Equals("linkk-mapping")) + if (command.Equals("link-mapping")) { if (cmdparams.Length == 2) { @@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid } } } - else if (command.Equals("linkk-region")) + else if (command.Equals("link-region")) { if (cmdparams.Length < 3) { @@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid } return; } - else if (command.Equals("unlinkk-region")) + else if (command.Equals("unlink-region")) { if (cmdparams.Length < 1) { diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 66cde91..0bb4206 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -159,27 +159,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid { m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); HGCommands hgCommands = new HGCommands(this, scene); - MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-region", + MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-region", "link-region :[:] ", "Link a hypergrid region", hgCommands.RunCommand); - MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlinkk-region", + MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlink-region", "unlink-region or : ", "Unlink a hypergrid region", hgCommands.RunCommand); - MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "linkk-mapping", "link-mapping [ ] ", + MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [ ] ", "Set local coordinate to map HG regions to", hgCommands.RunCommand); m_Initialized = true; } - - - //scene.AddCommand("HGGridServicesConnector", "linkk-region", - // "link-region :[:] ", - // "Link a hypergrid region", hgCommands.RunCommand); - //scene.AddCommand("HGGridServicesConnector", "unlinkk-region", - // "unlink-region or : ", - // "Unlink a hypergrid region", hgCommands.RunCommand); - //scene.AddCommand("HGGridServicesConnector", "linkk-mapping", "link-mapping [ ] ", - // "Set local coordinate to map HG regions to", hgCommands.RunCommand); - } #endregion @@ -450,15 +439,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid } // Finally, link it - try - { - RegisterRegion(UUID.Zero, regInfo); - } - catch (Exception e) - { - m_log.Warn("[HGrid]: Unable to link region: " + e.Message); - return false; - } + if (!RegisterRegion(UUID.Zero, regInfo)) + { + m_log.Warn("[HGrid]: Unable to link region"); + return false; + } int x, y; if (!Check4096(m_scene, regInfo, out x, out y)) -- cgit v1.1 From f4bf581b96347b8d7f115eca74fa84a644eb729c Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sat, 26 Sep 2009 21:00:51 -0700 Subject: Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo. Fixed small bugs with hyperlinked regions' map positions. --- .../Grid/HypergridServiceInConnectorModule.cs | 29 +-- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 227 ++++++++++++++++++++- .../Interregion/RESTInterregionComms.cs | 22 +- .../Inventory/HGInventoryBroker.cs | 9 +- .../CoreModules/World/WorldMap/MapSearchModule.cs | 4 +- 5 files changed, 249 insertions(+), 42 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 41f96b3..9bf31a4 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs @@ -37,6 +37,7 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Server.Base; using OpenSim.Server.Handlers.Base; using OpenSim.Server.Handlers.Grid; +using OpenSim.Services.Interfaces; using GridRegion = OpenSim.Services.Interfaces.GridRegion; namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid @@ -95,20 +96,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid if (!m_Enabled) return; - if (!m_Registered) - { - m_Registered = true; - - m_log.Info("[HypergridService]: Starting..."); - - Object[] args = new Object[] { m_Config, MainServer.Instance }; - - m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance); - //ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); - } - - GridRegion rinfo = new GridRegion(scene.RegionInfo); - m_HypergridHandler.AddRegion(rinfo); } public void RemoveRegion(Scene scene) @@ -122,6 +109,20 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid public void RegionLoaded(Scene scene) { + if (!m_Registered) + { + m_Registered = true; + + m_log.Info("[HypergridService]: Starting..."); + + Object[] args = new Object[] { m_Config, MainServer.Instance }; + + m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface()); + //ServerUtils.LoadPlugin("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args); + } + + GridRegion rinfo = new GridRegion(scene.RegionInfo); + m_HypergridHandler.AddRegion(rinfo); } #endregion diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 0bb4206..52db400 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -31,6 +31,7 @@ using System.Net; using System.Reflection; using System.Xml; +using OpenSim.Framework.Communications.Cache; using OpenSim.Framework; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -52,10 +53,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private static readonly ILog m_log = LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType); + private static string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI; private bool m_Enabled = false; private bool m_Initialized = false; + private Scene m_aScene; + private Dictionary m_LocalScenes = new Dictionary(); + private IGridService m_GridServiceConnector; private HypergridServiceConnector m_HypergridServiceConnector; @@ -141,6 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid if (!m_Enabled) return; + m_LocalScenes[scene.RegionInfo.RegionHandle] = scene; scene.RegisterModuleInterface(this); scene.RegisterModuleInterface(this); @@ -148,6 +154,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void RemoveRegion(Scene scene) { + m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); } public void RegionLoaded(Scene scene) @@ -157,7 +164,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid if (!m_Initialized) { + m_aScene = scene; + LocalAssetServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; + LocalInventoryServerURI = m_aScene.CommsManager.NetworkServersInfo.InventoryURL; + LocalUserServerURI = m_aScene.CommsManager.NetworkServersInfo.UserURL; + m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService); + HGCommands hgCommands = new HGCommands(this, scene); MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-region", "link-region :[:] ", @@ -167,6 +180,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid "Unlink a hypergrid region", hgCommands.RunCommand); MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [ ] ", "Set local coordinate to map HG regions to", hgCommands.RunCommand); + + // Yikes!! Remove this as soon as user services get refactored + HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI); + m_Initialized = true; } } @@ -240,7 +257,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid // Try the foreign users home collection foreach (GridRegion r in m_knownRegions.Values) if (r.RegionID == regionID) - return m_knownRegions[regionID]; + return r; // Finally, try the normal route return m_GridServiceConnector.GetRegionByUUID(scopeID, regionID); @@ -261,7 +278,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid foreach (GridRegion r in m_knownRegions.Values) { if ((r.RegionLocX == snapX) && (r.RegionLocY == snapY)) + { return r; + } } // Finally, try the normal route @@ -328,8 +347,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle) { - m_HyperlinkRegions.Add(regionInfo.RegionID, regionInfo); - m_HyperlinkHandles.Add(regionInfo.RegionID, regionHandle); + m_HyperlinkRegions[regionInfo.RegionID] = regionInfo; + m_HyperlinkHandles[regionInfo.RegionID] = regionHandle; } private void RemoveHyperlinkRegion(UUID regionID) @@ -340,8 +359,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid private void AddHyperlinkHomeRegion(UUID userID, GridRegion regionInfo, ulong regionHandle) { - m_knownRegions.Add(userID, regionInfo); - m_HyperlinkHandles.Add(regionInfo.RegionID, regionHandle); + m_knownRegions[userID] = regionInfo; + m_HyperlinkHandles[regionInfo.RegionID] = regionHandle; } private void RemoveHyperlinkHomeRegion(UUID regionID) @@ -412,7 +431,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid // From the map search and secondlife://blah public GridRegion TryLinkRegion(Scene m_scene, IClientAPI client, string mapName) { - int xloc = random.Next(0, Int16.MaxValue); + int xloc = random.Next(0, Int16.MaxValue) * (int) Constants.RegionSize; return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0); } @@ -563,10 +582,206 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid foreach (GridRegion r in m_HyperlinkRegions.Values) if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID))) return m_HyperlinkHandles[r.RegionID]; + + foreach (GridRegion r in m_knownRegions.Values) + if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID))) + return m_HyperlinkHandles[r.RegionID]; + return handle; } + public bool SendUserInformation(GridRegion regInfo, AgentCircuitData agentData) + { + CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID); + + if ((IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) || + (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo))) + { + m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere"); + + // Set the position of the region on the remote grid + ulong realHandle = FindRegionHandle(regInfo.RegionHandle); + uint x = 0, y = 0; + Utils.LongToUInts(regInfo.RegionHandle, out x, out y); + GridRegion clonedRegion = new GridRegion(regInfo); + clonedRegion.RegionLocX = (int)x; + clonedRegion.RegionLocY = (int)y; + + // Get the user's home region information + GridRegion home = m_aScene.GridService.GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID); + + // Get the user's service URLs + string serverURI = ""; + if (uinfo.UserProfile is ForeignUserProfileData) + serverURI = Util.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI); + string userServer = (serverURI == "") || (serverURI == null) ? LocalUserServerURI : serverURI; + + string assetServer = Util.ServerURI(uinfo.UserProfile.UserAssetURI); + if ((assetServer == null) || (assetServer == "")) + assetServer = LocalAssetServerURI; + + string inventoryServer = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); + if ((inventoryServer == null) || (inventoryServer == "")) + inventoryServer = LocalInventoryServerURI; + + if (!m_HypergridServiceConnector.InformRegionOfUser(clonedRegion, agentData, home, userServer, assetServer, inventoryServer)) + { + m_log.Warn("[HGrid]: Could not inform remote region of transferring user."); + return false; + } + } + //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo)) + //{ + // m_log.Info("[HGrid]: User seems to be going to foreign region."); + // if (!InformRegionOfUser(regInfo, agentData)) + // { + // m_log.Warn("[HGrid]: Could not inform remote region of transferring user."); + // return false; + // } + //} + //else + // m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName); + + // May need to change agent's name + if (IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) + { + agentData.firstname = agentData.firstname + "." + agentData.lastname; + agentData.lastname = "@" + LocalUserServerURI.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI; + } + + return true; + } + + public void AdjustUserInformation(AgentCircuitData agentData) + { + CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID); + if ((uinfo != null) && (uinfo.UserProfile != null) && + (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData))) + { + //m_log.Debug("---------------> Local User!"); + string[] parts = agentData.firstname.Split(new char[] { '.' }); + if (parts.Length == 2) + { + agentData.firstname = parts[0]; + agentData.lastname = parts[1]; + } + } + //else + // m_log.Debug("---------------> Foreign User!"); + } + + // Check if a local user exists with the same UUID as the incoming foreign user + public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome) + { + comingHome = false; + if (!m_aScene.SceneGridService.RegionLoginsEnabled) + return false; + + CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); + if (uinfo != null) + { + // uh-oh we have a potential intruder + if (uinfo.SessionID != sessionID) + // can't have a foreigner with a local UUID + return false; + else + // oh, so it's you! welcome back + comingHome = true; + } + + // OK, user can come in + return true; + } + + public void AcceptUser(ForeignUserProfileData user, GridRegion home) + { + m_aScene.CommsManager.UserProfileCacheService.PreloadUserCache(user); + ulong realHandle = home.RegionHandle; + // Change the local coordinates + // X=0 on the map + home.RegionLocX = 0; + home.RegionLocY = random.Next(0, 10000) * (int)Constants.RegionSize; + + AddHyperlinkHomeRegion(user.ID, home, realHandle); + + DumpUserData(user); + DumpRegionData(home); + + } + + public bool IsLocalUser(UUID userID) + { + CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); + return IsLocalUser(uinfo); + } + #endregion + #region IHyperlink Misc + + protected bool IsComingHome(ForeignUserProfileData userData) + { + return (userData.UserServerURI == LocalUserServerURI); + } + + // Is the user going back to the home region or the home grid? + protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo) + { + if (uinfo.UserProfile == null) + return false; + + if (!(uinfo.UserProfile is ForeignUserProfileData)) + // it's a home user, can't be outside to return home + return false; + + // OK, it's a foreign user with a ForeignUserProfileData + // and is going back to exactly the home region. + // We can't check if it's going back to a non-home region + // of the home grid. That will be dealt with in the + // receiving end + return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID); + } + + protected bool IsLocalUser(CachedUserInfo uinfo) + { + if (uinfo == null) + return false; + + return !(uinfo.UserProfile is ForeignUserProfileData); + + } + + protected bool IsLocalRegion(ulong handle) + { + return m_LocalScenes.ContainsKey(handle); + } + + private void DumpUserData(ForeignUserProfileData userData) + { + m_log.Info(" ------------ User Data Dump ----------"); + m_log.Info(" >> Name: " + userData.FirstName + " " + userData.SurName); + m_log.Info(" >> HomeID: " + userData.HomeRegionID); + m_log.Info(" >> UserServer: " + userData.UserServerURI); + m_log.Info(" >> InvServer: " + userData.UserInventoryURI); + m_log.Info(" >> AssetServer: " + userData.UserAssetURI); + m_log.Info(" ------------ -------------- ----------"); + } + + private void DumpRegionData(GridRegion rinfo) + { + m_log.Info(" ------------ Region Data Dump ----------"); + m_log.Info(" >> handle: " + rinfo.RegionHandle); + m_log.Info(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY); + m_log.Info(" >> external host name: " + rinfo.ExternalHostName); + m_log.Info(" >> http port: " + rinfo.HttpPort); + m_log.Info(" >> external EP address: " + rinfo.ExternalEndPoint.Address); + m_log.Info(" >> external EP port: " + rinfo.ExternalEndPoint.Port); + m_log.Info(" ------------ -------------- ----------"); + } + + + #endregion + + } } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs index adf747a..696225c 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs @@ -824,29 +824,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit) { - try - { - if (m_aScene.SceneGridService is HGSceneCommunicationService) - { - // big hack for now - RegionInfo r = new RegionInfo(); - r.ExternalHostName = regInfo.ExternalHostName; - r.HttpPort = regInfo.HttpPort; - r.RegionID = regInfo.RegionID; - r.RegionLocX = (uint)regInfo.RegionLocX; - r.RegionLocY = (uint)regInfo.RegionLocY; - ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.SendUserInformation(r, aCircuit); - } - } - catch // Bad cast - { } + if (m_hyperlinkService != null) + m_hyperlinkService.SendUserInformation(regInfo, aCircuit); } public override void AdjustUserInformation(AgentCircuitData aCircuit) { - if (m_aScene.SceneGridService is HGSceneCommunicationService) - ((HGSceneCommunicationService)(m_aScene.SceneGridService)).m_hg.AdjustUserInformation(aCircuit); + if (m_hyperlinkService != null) + m_hyperlinkService.AdjustUserInformation(aCircuit); } } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs index 1c66254..fd1a759 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs @@ -525,7 +525,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory return true; } - string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); + if ((uinfo.UserProfile.UserInventoryURI == null) || (uinfo.UserProfile.UserInventoryURI == "")) + // this happens in standalone profiles, apparently + return true; + + string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); + string uri = m_LocalGridInventoryURI.TrimEnd('/'); if ((userInventoryServerURI == uri) || (userInventoryServerURI == "")) @@ -544,7 +549,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory if ((uinfo == null) || (uinfo.UserProfile == null)) return invURI; - string userInventoryServerURI = HGNetworkServersInfo.ServerURI(uinfo.UserProfile.UserInventoryURI); + string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); if ((userInventoryServerURI != null) && (userInventoryServerURI != "")) diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs index e3661fa..436f332 100644 --- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs +++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs @@ -137,8 +137,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap data.Name = info.RegionName; data.RegionFlags = 0; // TODO not used? data.WaterHeight = 0; // not used - data.X = (ushort)info.RegionLocX; - data.Y = (ushort)info.RegionLocY; + data.X = (ushort)(info.RegionLocX / Constants.RegionSize); + data.Y = (ushort)(info.RegionLocY / Constants.RegionSize); blocks.Add(data); } } -- cgit v1.1 From 5d09c53a1a42b38e1ee35cfbb5571d70b75380f4 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 10:14:10 -0700 Subject: Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules. --- .../Neighbour/NeighbourServiceInConnectorModule.cs | 4 ++-- .../Neighbour/LocalNeighbourServiceConnector.cs | 4 ++-- .../Neighbour/RemoteNeighourServiceConnector.cs | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs index a31ce8e..8a90370 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Neighbour/NeighbourServiceInConnectorModule.cs @@ -121,7 +121,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour #region INeighbourService - public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) + public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) { m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", thisRegion.RegionName, regionHandle, m_Scenes.Count); @@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour } } m_log.DebugFormat("[NEIGHBOUR IN CONNECTOR]: region handle {0} not found", regionHandle); - return false; + return null; } #endregion INeighbourService diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs index 61bf481..daba0b3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/LocalNeighbourServiceConnector.cs @@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour #region INeighbourService - public bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) + public GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) { m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: HelloNeighbour from {0}, to {1}. Count = {2}", thisRegion.RegionName, regionHandle, m_Scenes.Count); @@ -132,7 +132,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour } } m_log.DebugFormat("[NEIGHBOUR CONNECTOR]: region handle {0} not found", regionHandle); - return false; + return null; } #endregion INeighbourService diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs index 912c393..c6fc2a1 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Neighbour/RemoteNeighourServiceConnector.cs @@ -141,10 +141,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour #region INeighbourService - public override bool HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) + public override GridRegion HelloNeighbour(ulong regionHandle, RegionInfo thisRegion) { - if (m_LocalService.HelloNeighbour(regionHandle, thisRegion)) - return true; + GridRegion region = m_LocalService.HelloNeighbour(regionHandle, thisRegion); + if (region != null) + return region; return base.HelloNeighbour(regionHandle, thisRegion); } -- cgit v1.1 From 2432cc607ec206b79149c1e9b1aa995794fec3bc Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 13:43:57 -0700 Subject: Neighbours cache working. --- .../ServiceConnectorsOut/Grid/HGGridConnector.cs | 4 ++ .../Grid/LocalGridServiceConnector.cs | 54 ++++++++++++++++++++-- .../ServiceConnectorsOut/Grid/RegionCache.cs | 52 +++++++++++++++++++++ .../Grid/RemoteGridServiceConnector.cs | 19 ++++++-- 4 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 52db400..c8062d7 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -135,6 +135,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void PostInitialise() { + ((ISharedRegionModule)m_GridServiceConnector).PostInitialise(); } public void Close() @@ -150,11 +151,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid scene.RegisterModuleInterface(this); scene.RegisterModuleInterface(this); + ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene); + } public void RemoveRegion(Scene scene) { m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); + ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); } public void RegionLoaded(Scene scene) diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 743d3b9..6c2928a 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -31,6 +31,7 @@ using System; using System.Collections.Generic; using System.Reflection; using OpenSim.Framework; +using OpenSim.Framework.Console; using OpenSim.Server.Base; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; @@ -47,7 +48,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid LogManager.GetLogger( MethodBase.GetCurrentMethod().DeclaringType); + private static LocalGridServicesConnector m_MainInstance; + private IGridService m_GridService; + private Dictionary m_LocalCache = new Dictionary(); private bool m_Enabled = false; @@ -58,6 +62,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public LocalGridServicesConnector(IConfigSource source) { m_log.Debug("[LOCAL GRID CONNECTOR]: LocalGridServicesConnector instantiated"); + m_MainInstance = this; InitialiseService(source); } @@ -82,6 +87,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid if (name == Name) { InitialiseService(source); + m_MainInstance = this; m_Enabled = true; m_log.Info("[LOCAL GRID CONNECTOR]: Local grid connector enabled"); } @@ -120,6 +126,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void PostInitialise() { + if (m_MainInstance == this) + { + MainConsole.Instance.Commands.AddCommand("LocalGridConnector", false, "show neighbours", + "show neighbours", + "Shows the local regions' neighbours", NeighboursCommand); + } } public void Close() @@ -128,14 +140,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void AddRegion(Scene scene) { - if (!m_Enabled) - return; + if (m_Enabled) + scene.RegisterModuleInterface(this); + + if (m_MainInstance == this) + { + if (m_LocalCache.ContainsKey(scene.RegionInfo.RegionID)) + m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); + else + m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); - scene.RegisterModuleInterface(this); + } } public void RemoveRegion(Scene scene) { + if (m_MainInstance == this) + { + m_LocalCache[scene.RegionInfo.RegionID].Clear(); + m_LocalCache.Remove(scene.RegionInfo.RegionID); + } } public void RegionLoaded(Scene scene) @@ -158,7 +182,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public List GetNeighbours(UUID scopeID, UUID regionID) { - return m_GridService.GetNeighbours(scopeID, regionID); + if (m_LocalCache.ContainsKey(regionID)) + { + return m_LocalCache[regionID].GetNeighbours(); + } + else + { + m_log.WarnFormat("[LOCAL GRID CONNECTOR]: GetNeighbours: Requested region {0} is not on this sim", regionID); + return new List(); + } + + // Don't go to the DB + //return m_GridService.GetNeighbours(scopeID, regionID); } public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) @@ -187,5 +222,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid } #endregion + + public void NeighboursCommand(string module, string[] cmdparams) + { + foreach (KeyValuePair kvp in m_LocalCache) + { + m_log.InfoFormat("*** Neighbours of {0} {1} ***", kvp.Key, kvp.Value.RegionName); + 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); + } + } } } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs new file mode 100644 index 0000000..ea205a2 --- /dev/null +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Reflection; + +using OpenSim.Region.Framework.Scenes; +using OpenSim.Services.Interfaces; +using GridRegion = OpenSim.Services.Interfaces.GridRegion; + +using log4net; + +namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid +{ + public class RegionCache + { + private static readonly ILog m_log = + LogManager.GetLogger( + MethodBase.GetCurrentMethod().DeclaringType); + + private Scene m_scene; + private Dictionary m_neighbours = new Dictionary(); + + public string RegionName + { + get { return m_scene.RegionInfo.RegionName; } + } + + public RegionCache(Scene s) + { + m_scene = s; + m_scene.EventManager.OnRegionUp += OnRegionUp; + } + + private void OnRegionUp(GridRegion otherRegion) + { + m_log.DebugFormat("[REGION CACHE]: (on region {0}) Region {1} is up @ {2}-{3}", + m_scene.RegionInfo.RegionName, otherRegion.RegionName, otherRegion.RegionLocX, otherRegion.RegionLocY); + + m_neighbours[otherRegion.RegionHandle] = otherRegion; + } + + public void Clear() + { + m_scene.EventManager.OnRegionUp -= OnRegionUp; + m_neighbours.Clear(); + } + + public List GetNeighbours() + { + return new List(m_neighbours.Values); + } + } +} diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs index 91a808b..72c00fc 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs @@ -104,6 +104,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void PostInitialise() { + if (m_LocalGridService != null) + ((ISharedRegionModule)m_LocalGridService).PostInitialise(); } public void Close() @@ -112,14 +114,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void AddRegion(Scene scene) { - if (!m_Enabled) - return; + if (m_Enabled) + scene.RegisterModuleInterface(this); - scene.RegisterModuleInterface(this); + if (m_LocalGridService != null) + ((ISharedRegionModule)m_LocalGridService).AddRegion(scene); } public void RemoveRegion(Scene scene) { + if (m_LocalGridService != null) + ((ISharedRegionModule)m_LocalGridService).RemoveRegion(scene); } public void RegionLoaded(Scene scene) @@ -146,7 +151,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid return false; } - // Let's not override GetNeighbours -- let's get them all from the grid server + // Let's override GetNeighbours completely -- never go to the grid server + // Neighbours are/should be cached locally + // For retrieval from the DB, caller should call GetRegionByPosition + public override List GetNeighbours(UUID scopeID, UUID regionID) + { + return m_LocalGridService.GetNeighbours(scopeID, regionID); + } public override GridRegion GetRegionByUUID(UUID scopeID, UUID regionID) { -- cgit v1.1 From 689eea3bad7a7dd7fa8dfdacacd891e1d390e51e Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 15:06:44 -0700 Subject: Guarding the methods under if (m_Enabled) --- .../CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index c8062d7..1eb481e 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -135,7 +135,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void PostInitialise() { - ((ISharedRegionModule)m_GridServiceConnector).PostInitialise(); + if (m_Enabled) + ((ISharedRegionModule)m_GridServiceConnector).PostInitialise(); } public void Close() @@ -157,8 +158,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid public void RemoveRegion(Scene scene) { - m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); - ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); + if (m_Enabled) + { + m_LocalScenes.Remove(scene.RegionInfo.RegionHandle); + ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene); + } } public void RegionLoaded(Scene scene) -- cgit v1.1 From e15a9b848413115644d3a6dd920e146b9589b639 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Sun, 27 Sep 2009 17:01:30 -0700 Subject: Fixed an issue with the PresenceModule in "gridmode", introduced by my fixing the notifications of the messaging service in standalone. --- OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | 3 --- 1 file changed, 3 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 5a9b452..ad05bab 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs @@ -330,9 +330,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage private void NotifyMessageServerOfStartup(Scene scene) { - if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) - return; - Hashtable xmlrpcdata = new Hashtable(); xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); ArrayList SendParams = new ArrayList(); -- cgit v1.1 From f00126dc2dfc9e23aa50227f02ee9adbe1efdfa6 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Tue, 29 Sep 2009 08:32:59 +0900 Subject: Add copyright header. Formatting cleanup. --- .../ServiceConnectorsOut/Grid/RegionCache.cs | 29 +++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs index ea205a2..2b336bb 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RegionCache.cs @@ -1,4 +1,31 @@ -using System; +/* + * 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.Generic; using System.Reflection; -- cgit v1.1 From 4eca59ec13bb48309120fea24890341c65157c65 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Sep 2009 17:33:34 -0700 Subject: Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache. Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes. --- .../ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs | 7 +++++-- .../ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs | 10 ++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs index 6c2928a..3ca4882 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs @@ -149,7 +149,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid m_log.ErrorFormat("[LOCAL GRID CONNECTOR]: simulator seems to have more than one region with the same UUID. Please correct this!"); else m_LocalCache.Add(scene.RegionInfo.RegionID, new RegionCache(scene)); - } } @@ -184,7 +183,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid { if (m_LocalCache.ContainsKey(regionID)) { - return m_LocalCache[regionID].GetNeighbours(); + List neighbours = m_LocalCache[regionID].GetNeighbours(); + if (neighbours.Count == 0) + // try the DB + neighbours = m_GridService.GetNeighbours(scopeID, regionID); + return neighbours; } else { diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs index be32d6b..2ca90f8 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/Tests/GridConnectorsTests.cs @@ -78,6 +78,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests r1.ExternalHostName = "127.0.0.1"; r1.HttpPort = 9001; r1.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); + Scene s = new Scene(new RegionInfo()); + s.RegionInfo.RegionID = r1.RegionID; + m_LocalConnector.AddRegion(s); + GridRegion r2 = new GridRegion(); r2.RegionName = "Test Region 2"; @@ -87,6 +91,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests r2.ExternalHostName = "127.0.0.1"; r2.HttpPort = 9002; r2.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); + s = new Scene(new RegionInfo()); + s.RegionInfo.RegionID = r1.RegionID; + m_LocalConnector.AddRegion(s); GridRegion r3 = new GridRegion(); r3.RegionName = "Test Region 3"; @@ -96,6 +103,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.Tests r3.ExternalHostName = "127.0.0.1"; r3.HttpPort = 9003; r3.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), 0); + s = new Scene(new RegionInfo()); + s.RegionInfo.RegionID = r1.RegionID; + m_LocalConnector.AddRegion(s); m_LocalConnector.RegisterRegion(UUID.Zero, r1); GridRegion result = m_LocalConnector.GetRegionByName(UUID.Zero, "Test"); -- cgit v1.1 From 95981776dda88f97c4a1d016e1e266e8ff1d54aa Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 28 Sep 2009 20:11:10 -0700 Subject: Fixed bug in Check4096 (HG). --- .../Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs index 1eb481e..148331b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs @@ -554,8 +554,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid x = (int)(ux / Constants.RegionSize); y = (int)(uy / Constants.RegionSize); - if ((Math.Abs((int)(m_scene.RegionInfo.RegionLocX / Constants.RegionSize) - x) >= 4096) || - (Math.Abs((int)(m_scene.RegionInfo.RegionLocY / Constants.RegionSize) - y) >= 4096)) + if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - x) >= 4096) || + (Math.Abs((int)m_scene.RegionInfo.RegionLocY - y) >= 4096)) { return false; } -- cgit v1.1 From bc892c1d4c1f1e818f1dd1d3cf6d03186b19dd0b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Sep 2009 07:54:56 -0700 Subject: A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions. --- .../CoreModules/World/Land/RegionCombinerModule.cs | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 181c5ae..710e356 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -35,6 +35,7 @@ using OpenSim.Framework; using OpenSim.Framework.Client; using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; +using OpenSim.Framework.Console; namespace OpenSim.Region.CoreModules.World.Land { @@ -61,7 +62,10 @@ namespace OpenSim.Region.CoreModules.World.Land IConfig myConfig = source.Configs["Startup"]; enabledYN = myConfig.GetBoolean("CombineContiguousRegions", false); //enabledYN = true; - } + if (enabledYN) + MainConsole.Instance.Commands.AddCommand("RegionCombinerModule", false, "fix-phantoms", + "Fix phantom objects", "Fixes phantom objects after an import to megaregions", FixPhantoms); + } public void Close() { @@ -910,5 +914,20 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnTeleport += BigRegion.PermissionModule.CanTeleport; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnUseObjectReturn += BigRegion.PermissionModule.CanUseObjectReturn; //NOT YET IMPLEMENTED } + + #region console commands + public void FixPhantoms(string module, string[] cmdparams) + { + List scenes = new List(m_startingScenes.Values); + foreach (Scene s in scenes) + { + s.ForEachSOG(delegate(SceneObjectGroup e) + { + e.AbsolutePosition = e.AbsolutePosition; + } + ); + } + } + #endregion } } -- cgit v1.1 From b1d204802fa1c07e3b00d0b363346673b763d67b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 29 Sep 2009 16:13:07 -0700 Subject: Minor bug fixes. --- .../ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs | 3 +++ .../ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs index 9bf31a4..92db15b 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs @@ -109,6 +109,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid public void RegionLoaded(Scene scene) { + if (!m_Enabled) + return; + if (!m_Registered) { m_Registered = true; diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs index 0d32c77..69504df 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs @@ -107,7 +107,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory public void AddRegion(Scene scene) { m_Scene = scene; - m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); + //m_log.Debug("[XXXX] Adding scene " + m_Scene.RegionInfo.RegionName); if (!m_Enabled) return; -- cgit v1.1 From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- .../AgentAssetTransactionsManager.cs | 2 +- .../Agent/Capabilities/CapabilitiesModule.cs | 10 ++--- .../Region/CoreModules/Agent/IPBan/SceneBanner.cs | 2 +- .../Agent/TextureSender/J2KDecoderModule.cs | 2 +- .../Region/CoreModules/Asset/CenomeAssetCache.cs | 4 +- .../Region/CoreModules/Asset/FlotsamAssetCache.cs | 2 +- .../Region/CoreModules/Avatar/Chat/ChatModule.cs | 2 +- .../CoreModules/Avatar/Dialog/DialogModule.cs | 22 +++++----- .../CoreModules/Avatar/Friends/FriendsModule.cs | 14 +++--- .../CoreModules/Avatar/Gestures/GesturesModule.cs | 2 +- .../Region/CoreModules/Avatar/Gods/GodsModule.cs | 6 +-- .../Avatar/InstantMessage/InstantMessageModule.cs | 2 +- .../Archiver/InventoryArchiveReadRequest.cs | 12 +++--- .../Inventory/Archiver/InventoryArchiveUtils.cs | 12 +++--- .../Archiver/InventoryArchiveWriteRequest.cs | 20 ++++----- .../Inventory/Archiver/InventoryArchiverModule.cs | 46 ++++++++++---------- .../Archiver/Tests/InventoryArchiverTests.cs | 36 ++++++++-------- .../Inventory/Transfer/InventoryTransferModule.cs | 12 +++--- .../Framework/EventQueue/EventQueueGetModule.cs | 2 +- .../InterGrid/OpenGridProtocolModule.cs | 4 +- .../Scripting/VectorRender/VectorRenderModule.cs | 8 ++-- .../LocalAuthorizationServiceConnector.cs | 2 +- .../RemoteAuthorizationServiceConnector.cs | 2 +- .../World/Archiver/ArchiveReadRequest.cs | 8 ++-- .../Archiver/ArchiveWriteRequestPreparation.cs | 6 +-- .../CoreModules/World/Archiver/ArchiverModule.cs | 10 ++--- .../CoreModules/World/Archiver/AssetsArchiver.cs | 2 +- .../CoreModules/World/Archiver/AssetsRequest.cs | 12 +++--- .../World/Archiver/Tests/ArchiverTests.cs | 10 ++--- .../Region/CoreModules/World/Land/LandObject.cs | 4 +- .../Land/RegionCombinerIndividualEventForwarder.cs | 2 +- .../CoreModules/World/Land/RegionCombinerModule.cs | 10 ++--- .../World/Permissions/PermissionsModule.cs | 50 +++++++++++----------- .../World/Serialiser/SerialiserModule.cs | 2 +- .../World/Serialiser/Tests/SerialiserTests.cs | 16 +++---- .../Region/CoreModules/World/Sound/SoundModule.cs | 12 +++--- OpenSim/Region/CoreModules/World/Sun/SunModule.cs | 4 +- .../World/Vegetation/VegetationModule.cs | 6 +-- .../World/Wind/Plugins/ConfigurableWind.cs | 2 +- .../World/Wind/Plugins/SimpleRandomWind.cs | 2 +- .../Region/CoreModules/World/Wind/WindModule.cs | 2 +- 41 files changed, 193 insertions(+), 193 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs index addc36b..9c646b6 100644 --- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs +++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetTransactionsManager.cs @@ -162,7 +162,7 @@ namespace OpenSim.Region.CoreModules.Agent.AssetTransaction AgentAssetTransactions transactions = GetUserTransactions(remoteClient.AgentId); transactions.RequestUpdateTaskInventoryItem(remoteClient, part, transactionID, item); - } + } /// /// Request that a client (agent) begin an asset transfer. diff --git a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs index 0c6900d..2a1355b 100644 --- a/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs +++ b/OpenSim/Region/CoreModules/Agent/Capabilities/CapabilitiesModule.cs @@ -49,9 +49,9 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities /// protected Dictionary m_capsHandlers = new Dictionary(); - protected Dictionary capsPaths = new Dictionary(); + protected Dictionary capsPaths = new Dictionary(); protected Dictionary> childrenSeeds - = new Dictionary>(); + = new Dictionary>(); public void Initialise(IConfigSource source) { @@ -147,7 +147,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities agentId, m_scene.RegionInfo.RegionName); } } - } + } public Caps GetCapsHandlerForUser(UUID agentId) { @@ -177,7 +177,7 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities } return null; - } + } public Dictionary GetChildrenSeeds(UUID agentID) { @@ -225,6 +225,6 @@ namespace OpenSim.Region.CoreModules.Agent.Capabilities y = y / Constants.RegionSize; m_log.Info(" >> "+x+", "+y+": "+kvp.Value); } - } + } } } diff --git a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs index 394b1bb..8502006 100644 --- a/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs +++ b/OpenSim/Region/CoreModules/Agent/IPBan/SceneBanner.cs @@ -51,7 +51,7 @@ namespace OpenSim.Region.CoreModules.Agent.IPBan { // Only need to run through all this if there are entries in the ban list if (bans.Count > 0) - { + { IClientIPEndpoint ipEndpoint; if (client.TryGet(out ipEndpoint)) { diff --git a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs index 937f76b..1fdb003 100644 --- a/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs +++ b/OpenSim/Region/CoreModules/Agent/TextureSender/J2KDecoderModule.cs @@ -361,7 +361,7 @@ namespace OpenSim.Region.CoreModules.Agent.TextureSender m_cacheddecode.Remove(AssetId); m_cacheddecode.Add(AssetId, layers); - } + } // Notify Interested Parties lock (m_notifyList) diff --git a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs index a1e27f1..5a5ad7e 100644 --- a/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/CenomeAssetCache.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Asset /// /// Cache is enabled by setting "AssetCaching" configuration to value "CenomeMemoryAssetCache". /// When cache is successfully enable log should have message - /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)". + /// "[ASSET CACHE]: Cenome asset cache enabled (MaxSize = XXX bytes, MaxCount = XXX, ExpirationTime = XXX)". /// /// /// Cache's size is limited by two parameters: @@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Asset /// /// Asset's default expiration time in the cache. - /// + /// public static readonly TimeSpan DefaultExpirationTime = TimeSpan.FromMinutes(30.0); /// diff --git a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs index 37cccc8..817e0d4 100644 --- a/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs +++ b/OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs @@ -470,7 +470,7 @@ namespace Flotsam.RegionModules.AssetCache else if (dirSize >= m_CacheWarnAt) { m_log.WarnFormat("[FLOTSAM ASSET CACHE]: Cache folder exceeded CacheWarnAt limit {0} {1}. Suggest increasing tiers, tier length, or reducing cache expiration", dir, dirSize); - } + } } private string GetFileName(string id) diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index fcc2673..66a9b5a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat scene.EventManager.OnChatBroadcast -= OnChatBroadcast; m_scenes.Remove(scene); } - } + } } public virtual void Close() diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 046fc4a..413c6e8 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs @@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog this, "alert", "alert ", "Send an alert to a user", HandleAlertConsoleCommand); m_scene.AddCommand( - this, "alert general", "alert general ", "Send an alert to everyone", HandleAlertConsoleCommand); + this, "alert general", "alert general ", "Send an alert to everyone", HandleAlertConsoleCommand); } public void PostInitialise() {} @@ -63,7 +63,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog public void SendAlertToUser(IClientAPI client, string message) { SendAlertToUser(client, message, false); - } + } public void SendAlertToUser(IClientAPI client, string message, bool modal) { @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog public void SendAlertToUser(UUID agentID, string message) { SendAlertToUser(agentID, message, false); - } + } public void SendAlertToUser(UUID agentID, string message, bool modal) { @@ -81,7 +81,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog if (sp != null) sp.ControllingClient.SendAgentAlertMessage(message, modal); - } + } public void SendAlertToUser(string firstName, string lastName, string message, bool modal) { @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog break; } } - } + } public void SendGeneralAlert(string message) { @@ -106,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog if (!presence.IsChildAgent) presence.ControllingClient.SendAlertMessage(message); } - } + } public void SendDialogToUser( UUID avatarID, string objectName, UUID objectID, UUID ownerID, @@ -135,9 +135,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog { ScenePresence sp = m_scene.GetScenePresence(avatarID); - if (sp != null) + if (sp != null) sp.ControllingClient.SendLoadURL(objectName, objectID, ownerID, groupOwned, message, url); - } + } public void SendNotificationToUsersInEstate( UUID fromAvatarID, string fromAvatarName, string message) @@ -145,11 +145,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog // TODO: This does not yet do what it says on the tin - it only sends the message to users in the same // region as the sending avatar. SendNotificationToUsersInRegion(fromAvatarID, fromAvatarName, message); - } + } public void SendNotificationToUsersInRegion( UUID fromAvatarID, string fromAvatarName, string message) - { + { List presenceList = m_scene.GetScenePresences(); foreach (ScenePresence presence in presenceList) @@ -199,6 +199,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog } return result; - } + } } } diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index dd9b318..fc7d63a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs @@ -497,7 +497,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends { m_log.ErrorFormat("[FRIENDS]: No user found for id {0} in OfferFriendship()", fromUserId); } - } + } #region FriendRequestHandling @@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends if (im.dialog == (byte)InstantMessageDialog.FriendshipOffered) // 38 { - // fromAgentName is the *destination* name (the friend we offer friendship to) + // fromAgentName is the *destination* name (the friend we offer friendship to) ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID)); im.fromAgentName = initiator != null ? initiator.Name : "(hippo)"; @@ -528,13 +528,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends /// Invoked when a user offers a friendship. /// /// - /// + /// /// private void FriendshipOffered(GridInstantMessage im) { // this is triggered by the initiating agent: // A local agent offers friendship to some possibly remote friend. - // A IM is triggered, processed here and sent to the friend (possibly in a remote region). + // A IM is triggered, processed here and sent to the friend (possibly in a remote region). m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}", im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline); @@ -559,7 +559,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); } ); - } + } } /// @@ -570,7 +570,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends private void FriendshipAccepted(IClientAPI client, GridInstantMessage im) { m_log.DebugFormat("[FRIEND]: 39 - from client {0}, agent {2} {3}, imsession {4} to {5}: {6} (dialog {7})", - client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog); + client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog); } /// @@ -602,7 +602,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends delegate(bool success) { m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success); } - ); + ); } private void OnGridInstantMessage(GridInstantMessage msg) diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs index ff12361..8ce5092 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs @@ -91,6 +91,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures else m_log.ErrorFormat( "[GESTURES]: Unable to find gesture to deactivate {0} for {1}", gestureId, client.Name); - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index 8926527..f941728 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods { m_scene = scene; m_dialogModule = m_scene.RequestModuleInterface(); - m_scene.RegisterModuleInterface(this); + m_scene.RegisterModuleInterface(this); } public void PostInitialise() {} @@ -84,7 +84,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods m_dialogModule.SendAlertToUser(agentID, "Request for god powers denied"); } } - } + } /// /// Kicks User specified from the simulator. This logs them off of the grid @@ -142,7 +142,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods } } else - { + { m_dialogModule.SendAlertToUser(godID, "Kick request denied"); } } diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs index 66f1e14..9a68749 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs @@ -38,7 +38,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage { public class InstantMessageModule : IRegionModule { - private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); /// /// Is this module enabled? diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 907e2d4..f761bf0 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// We only use this to request modules /// - protected Scene m_scene; + protected Scene m_scene; /// /// The stream from which the inventory archive will be loaded. @@ -186,7 +186,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver item.Folder = foundFolder.ID; //m_userInfo.AddItem(item); - m_scene.InventoryService.AddItem(item); + m_scene.InventoryService.AddItem(item); successfulItemRestores++; // If we're loading an item directly into the given destination folder then we need to record @@ -299,14 +299,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver = new InventoryFolderBase( newFolderId, newFolderName, m_userInfo.UserProfile.ID, (short)AssetType.Unknown, destFolder.ID, 1); - m_scene.InventoryService.AddFolder(destFolder); + m_scene.InventoryService.AddFolder(destFolder); // UUID newFolderId = UUID.Random(); // m_scene.InventoryService.AddFolder( // m_userInfo.CreateFolder( // folderName, newFolderId, (ushort)AssetType.Folder, foundFolder.ID); -// m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName); +// m_log.DebugFormat("[INVENTORY ARCHIVER]: Retrieving newly created folder {0}", folderName); // foundFolder = foundFolder.GetChildFolder(newFolderId); // m_log.DebugFormat( // "[INVENTORY ARCHIVER]: Retrieved newly created folder {0} with ID {1}", @@ -321,7 +321,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver nodesLoaded.Add(destFolder); i++; - } + } return destFolder; @@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver rawFolders[i++], newFolderId, (ushort)AssetType.Folder, foundFolder.ID); foundFolder = foundFolder.GetChildFolder(newFolderId); } - */ + */ } /// diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index 5ebf2fa..a73f868 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs @@ -42,7 +42,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// Find a folder given a PATH_DELIMITER delimited path starting from a user's root folder - /// + /// /// /// This method does not handle paths that contain multiple delimitors /// @@ -71,11 +71,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver return null; return FindFolderByPath(inventoryService, rootFolder, path); - } + } /// /// Find a folder given a PATH_DELIMITER delimited path starting from this folder - /// + /// /// /// This method does not handle paths that contain multiple delimitors /// @@ -154,7 +154,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver return null; return FindItemByPath(inventoryService, rootFolder, path); - } + } /// /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. @@ -194,7 +194,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } else { - InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID); + InventoryCollection contents = inventoryService.GetFolderContent(startFolder.Owner, startFolder.ID); foreach (InventoryFolderBase folder in contents.Folders) { @@ -205,6 +205,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver // We didn't find an item or intermediate folder with the given name return null; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index c6ebb24..499c552 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs @@ -55,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver private InventoryArchiverModule m_module; private CachedUserInfo m_userInfo; - private string m_invPath; + private string m_invPath; protected TarArchiveWriter m_archiveWriter; protected UuidGatherer m_assetGatherer; @@ -168,7 +168,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver { path += CreateArchiveFolderName(inventoryFolder); - // We need to make sure that we record empty folders + // We need to make sure that we record empty folders m_archiveWriter.WriteDir(path); } @@ -262,7 +262,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (maxComponentIndex >= 0 && components[maxComponentIndex] == STAR_WILDCARD) { foundStar = true; - maxComponentIndex--; + maxComponentIndex--; } m_invPath = String.Empty; @@ -369,8 +369,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public static string CreateArchiveFolderName(InventoryFolderBase folder) { - return CreateArchiveFolderName(folder.Name, folder.ID); - } + return CreateArchiveFolderName(folder.Name, folder.ID); + } /// /// Create the archive name for a particular item. @@ -383,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public static string CreateArchiveItemName(InventoryItemBase item) { - return CreateArchiveItemName(item.Name, item.ID); + return CreateArchiveItemName(item.Name, item.ID); } /// @@ -398,7 +398,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "{0}{1}{2}/", name, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, - id); + id); } /// @@ -406,14 +406,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// /// - /// + /// public static string CreateArchiveItemName(string name, UUID id) { return string.Format( "{0}{1}{2}.xml", name, ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR, - id); + id); } /// @@ -438,6 +438,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver sw.Close(); return s; - } + } } } \ No newline at end of file diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index 55dce05..1228eb1 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs @@ -40,12 +40,12 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Services.Interfaces; namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver -{ +{ /// /// This module loads and saves OpenSimulator inventory archives - /// + /// public class InventoryArchiverModule : IRegionModule, IInventoryArchiverModule - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public string Name { get { return "Inventory Archiver Module"; } } @@ -57,7 +57,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// public bool DisablePresenceChecks { get; set; } - public event InventoryArchiveSaved OnInventoryArchiveSaved; + public event InventoryArchiveSaved OnInventoryArchiveSaved; /// /// The file to load and save inventory if no filename has been specified @@ -83,7 +83,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } public void Initialise(Scene scene, IConfigSource source) - { + { if (m_scenes.Count == 0) { scene.RegisterModuleInterface(this); @@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver m_aScene = scene; } - m_scenes[scene.RegionInfo.RegionID] = scene; + m_scenes[scene.RegionInfo.RegionID] = scene; } public void PostInitialise() {} @@ -119,7 +119,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; if (handlerInventoryArchiveSaved != null) handlerInventoryArchiveSaved(id, succeeded, userInfo, invPath, saveStream, reportedException); - } + } public bool ArchiveInventory(Guid id, string firstName, string lastName, string invPath, string pass, Stream saveStream) { @@ -174,7 +174,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, Stream loadStream) { if (m_scenes.Count > 0) - { + { CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); if (userInfo != null) @@ -182,7 +182,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (CheckPresence(userInfo.UserProfile.ID)) { InventoryArchiveReadRequest request = - new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); + new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); UpdateClientWithLoadedNodes(userInfo, request.Execute()); return true; @@ -197,12 +197,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } return false; - } + } public bool DearchiveInventory(string firstName, string lastName, string invPath, string pass, string loadPath) { if (m_scenes.Count > 0) - { + { CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); if (userInfo != null) @@ -210,7 +210,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver if (CheckPresence(userInfo.UserProfile.ID)) { InventoryArchiveReadRequest request = - new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); + new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); UpdateClientWithLoadedNodes(userInfo, request.Execute()); return true; @@ -221,11 +221,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", userInfo.UserProfile.Name, userInfo.UserProfile.ID); } - } + } } return false; - } + } /// /// Load inventory from an inventory file archive @@ -252,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver "[INVENTORY ARCHIVER]: Loading archive {0} to inventory path {1} for {2} {3}", loadPath, invPath, firstName, lastName); - if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath)) + if (DearchiveInventory(firstName, lastName, invPath, pass, loadPath)) m_log.InfoFormat( "[INVENTORY ARCHIVER]: Loaded archive {0} for {1} {2}", loadPath, firstName, lastName); @@ -288,7 +288,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver lock (m_pendingConsoleSaves) m_pendingConsoleSaves.Add(id); - } + } private void SaveInvConsoleCommandCompleted( Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// User password /// protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) - { + { CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName); if (null == userInfo) @@ -334,7 +334,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } try - { + { if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) { return userInfo; @@ -343,7 +343,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver { m_log.ErrorFormat( "[INVENTORY ARCHIVER]: Password for user {0} {1} incorrect. Please try again.", - firstName, lastName); + firstName, lastName); return null; } } @@ -359,7 +359,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// /// Can be empty. In which case, nothing happens private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List loadedNodes) - { + { if (loadedNodes.Count == 0) return; @@ -368,7 +368,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID); if (user != null && !user.IsChildAgent) - { + { foreach (InventoryNodeBase node in loadedNodes) { // m_log.DebugFormat( @@ -379,8 +379,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver } break; - } - } + } + } } /// diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs index ed293cd..b0fdcd6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs @@ -37,7 +37,7 @@ using OpenMetaverse; using OpenSim.Data; using OpenSim.Framework; using OpenSim.Framework.Serialization; -using OpenSim.Framework.Serialization.External; +using OpenSim.Framework.Serialization.External; using OpenSim.Framework.Communications; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Communications.Osp; @@ -70,7 +70,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Exception reportedException) { mre.Set(); - } + } /// /// Test saving a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet). @@ -157,7 +157,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string expectedObject1FilePath = string.Format( "{0}{1}{2}", ArchiveConstants.INVENTORY_PATH, - InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder), + InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder), expectedObject1FileName); string filePath; @@ -195,7 +195,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(gotObject1File, Is.True, "No item1 file in archive"); // Assert.That(gotObject2File, Is.True, "No object2 file in archive"); - // TODO: Test presence of more files and contents of files. + // TODO: Test presence of more files and contents of files. } /// @@ -206,7 +206,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// This test also does some deeper probing of loading into nested inventory structures [Test] public void TestLoadIarV0_1ExistingUsers() - { + { TestHelper.InMethod(); //log4net.Config.XmlConfigurator.Configure(); @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -271,9 +271,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(foundItem1.Owner, Is.EqualTo(userUuid), "Loaded item owner doesn't match inventory reciever"); - // Now try loading to a root child folder + // Now try loading to a root child folder UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA"); - archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); + archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream); InventoryItemBase foundItem2 @@ -282,12 +282,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests // Now try loading to a more deeply nested folder UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC"); - archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); + archiveReadStream = new MemoryStream(archiveReadStream.ToArray()); archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream); InventoryItemBase foundItem3 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + itemName); - Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); + Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3"); } /// @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// (as tested in the a later commented out test) [Test] public void TestLoadIarV0_1AbsentUsers() - { + { TestHelper.InMethod(); log4net.Config.XmlConfigurator.Configure(); @@ -331,7 +331,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -357,8 +357,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests // "Loaded item non-uuid creator doesn't match that of the loading user"); Assert.That( foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid), - "Loaded item uuid creator doesn't match that of the loading user"); - } + "Loaded item uuid creator doesn't match that of the loading user"); + } /// /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where @@ -367,7 +367,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests /// Disabled since temporary profiles have not yet been implemented. //[Test] public void TestLoadIarV0_1TempProfiles() - { + { TestHelper.InMethod(); log4net.Config.XmlConfigurator.Configure(); @@ -396,7 +396,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); tar.Close(); - MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); + MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); SerialiserModule serialiserModule = new SerialiserModule(); InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); @@ -436,7 +436,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod()); - } + } /// /// Test replication of an archive path to the user's inventory. @@ -474,7 +474,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests string itemArchivePath = string.Format( "{0}{1}{2}{3}", - ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName); + ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName); //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 75976e2..734230c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -172,9 +172,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); if (user != null && !user.IsChildAgent) - { + { user.ControllingClient.SendBulkUpdateInventory(folderCopy); - } + } } else { @@ -199,10 +199,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } copyID = itemCopy.ID; - Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16); + Array.Copy(copyID.GetBytes(), 0, im.binaryBucket, 1, 16); if (user != null && !user.IsChildAgent) - { + { user.ControllingClient.SendBulkUpdateInventory(itemCopy); } } @@ -241,7 +241,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } } else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) - { + { // Here, the recipient is local and we can assume that the // inventory is loaded. Courtesy of the above bulk update, // It will have been pushed to the client, too @@ -284,7 +284,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer } if ((null == item && null == folder) | null == trashFolder) - { + { string reason = String.Empty; if (trashFolder == null) diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs index 0cdd9a8..1b23d92 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueGetModule.cs @@ -454,7 +454,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue responsedata["error_status_text"] = "Upstream error:"; responsedata["http_protocol_version"] = "HTTP/1.0"; return responsedata; - } + } OSDArray array = new OSDArray(); if (element == null) // didn't have an event in 15s diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs index e9c1e9d..7d6f150 100644 --- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs +++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs @@ -353,11 +353,11 @@ namespace OpenSim.Region.CoreModules.InterGrid return responseMap; } - // Using OpenSim.Framework.Capabilities.Caps here one time.. + // Using OpenSim.Framework.Capabilities.Caps here one time.. // so the long name is probably better then a using statement public void OnRegisterCaps(UUID agentID, Caps caps) { - /* If we ever want to register our own caps here.... + /* If we ever want to register our own caps here.... * string capsBase = "/CAPS/" + caps.CapsObjectPath; caps.RegisterHandler("CAPNAME", diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs index bea6222..d57a8e5 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs @@ -184,7 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender string value = ""; if (nvp[0] != null) - { + { name = nvp[0].Trim(); } @@ -291,10 +291,10 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender temp = 128; width = temp; - height = temp; + height = temp; } } - break; + break; } } @@ -410,7 +410,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender Font myFont = new Font(fontName, fontSize); SolidBrush myBrush = new SolidBrush(Color.Black); - char[] lineDelimiter = {dataDelim}; + char[] lineDelimiter = {dataDelim}; char[] partsDelimiter = {','}; string[] lines = data.Split(lineDelimiter); diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs index e69613a..85a1ac3 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/LocalAuthorizationServiceConnector.cs @@ -134,7 +134,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization public bool IsAuthorizedForRegion(string userID, string regionID, out string message) { - return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message); + return m_AuthorizationService.IsAuthorizedForRegion(userID, regionID, out message); } } diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs index a672f4f..fca2df2 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs @@ -146,7 +146,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization else { m_log.ErrorFormat("[REMOTE AUTHORIZATION CONNECTOR] IsAuthorizedForRegion, can't find scene to match region id of {0} ",regionID); - } + } return isAuthorized; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 376ea8a..65f83fd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver TarArchiveReader.TarEntryType entryType; while ((data = archive.ReadEntry(out filePath, out entryType)) != null) - { + { //m_log.DebugFormat( // "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length); if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) - continue; + continue; if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) { @@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface(); - int sceneObjectsLoadedCount = 0; + int sceneObjectsLoadedCount = 0; foreach (string serialisedSceneObject in serialisedSceneObjects) { @@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); XmlTextReader xtr - = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); + = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 63608a8..9e4fbbe 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene = scene; m_saveStream = saveStream; m_requestId = requestId; - } + } /// /// Archive the region requested. /// /// if there was an io problem with creating the file public void ArchiveRegion() - { + { Dictionary assetUuids = new Dictionary(); List entities = m_scene.GetEntities(); @@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene.RequestModuleInterface(), m_scene, archiveWriter, - m_requestId); + m_requestId); new AssetsRequest( new AssetsArchiver(archiveWriter), assetUuids.Keys, diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 5c58b69..8d4f91b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void Close() { - } + } public void ArchiveRegion(string savePath) { @@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat( "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); - new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); + new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); } public void ArchiveRegion(Stream saveStream) @@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void ArchiveRegion(Stream saveStream, Guid requestId) { new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion(); - } + } public void DearchiveRegion(string loadPath) { @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion(); - } + } public void DearchiveRegion(Stream loadStream) { @@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId) { new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion(); - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 330fa3f..95d109c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// /// public void WriteAsset(AssetBase asset) - { + { //WriteMetadata(archive); WriteData(asset); } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 82803bf..fe9c8d9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT); m_requestCallbackTimer.AutoReset = false; - m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); + m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); } protected internal void Execute() @@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) { try - { + { lock (this) { // Take care of the possibilty that this thread started but was paused just outside the lock before @@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } // Calculate which uuids were not found. This is an expensive way of doing it, but this is a failure - // case anyway. + // case anyway. List uuids = new List(); foreach (UUID uuid in m_uuids) { @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.ErrorFormat( "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); - m_log.Error("[ARCHIVER]: OAR save aborted."); + m_log.Error("[ARCHIVER]: OAR save aborted."); } catch (Exception e) { @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id); - m_requestCallbackTimer.Stop(); + m_requestCallbackTimer.Stop(); if (m_requestState == RequestState.Aborted) { @@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } catch (Exception e) { - m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); + m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 5c42e94..edac4a4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests m_lastErrorMessage = errorMessage; Console.WriteLine("About to pulse ArchiverTests on LoadCompleted"); - Monitor.PulseAll(this); + Monitor.PulseAll(this); } } @@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests archiverModule.ArchiveRegion(archiveWriteStream, requestId); //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //while (assetServer.HasWaitingRequests()) - // assetServer.ProcessNextRequest(); + // assetServer.ProcessNextRequest(); Monitor.Wait(this, 60000); } @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests // Also check that direct entries which will also have a file entry containing that directory doesn't // upset load - tar.WriteDir(ArchiveConstants.TERRAINS_PATH); + tar.WriteDir(ArchiveConstants.TERRAINS_PATH); tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile()); @@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests { scene.EventManager.OnOarFileLoaded += LoadCompleted; archiverModule.DearchiveRegion(archiveReadStream); - } + } Assert.That(m_lastErrorMessage, Is.Null); @@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests /// /// Test merging a V0.2 OpenSim Region Archive into an existing scene - /// + /// //[Test] public void TestMergeOarV0_2() { diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 2701f60..3be5f45 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -954,7 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMediaUrl(string url) { landData.MediaURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } /// @@ -964,7 +964,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMusicUrl(string url) { landData.MusicURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } } } diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs index 65f22b1..2cbaf96 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, UUID fromtaskid) - { + { int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX; int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY; rayend.X += differenceX * (int)Constants.RegionSize; diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 710e356..d9f377b 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject; VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED - VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage; VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -899,11 +899,11 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDelinkObject += BigRegion.PermissionModule.CanDelinkObject; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnBuyLand += BigRegion.PermissionModule.CanBuyLand; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnViewNotecard += BigRegion.PermissionModule.CanViewNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnCreateObjectInventory += BigRegion.PermissionModule.CanCreateObjectInventory; //NOT IMPLEMENTED HERE - VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnCopyObjectInventory += BigRegion.PermissionModule.CanCopyObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnDeleteObjectInventory += BigRegion.PermissionModule.CanDeleteObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnResetScript += BigRegion.PermissionModule.CanResetScript; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index f360577..b09c7a1 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions Administrators }; - #endregion + #endregion #region Bypass Permissions / Debug Permissions Stuff @@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// The set of users that are allowed to edit (save) scripts. This is only active if /// permissions are not being bypassed. This overrides normal permissions.- - /// + /// private UserSet m_allowedScriptEditors = UserSet.All; private Dictionary GrantLSL = new Dictionary(); @@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnDuplicateObject += CanDuplicateObject; m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED - m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnInstantMessage += CanInstantMessage; m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -210,12 +210,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE - m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnResetScript += CanResetScript; @@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions foreach (string uuidl in grant.Split(',')) { string uuid = uuidl.Trim(" \t".ToCharArray()); GrantLSL.Add(uuid, true); - } + } } grant = myConfig.GetString("GrantCS",""); @@ -431,7 +431,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_log.ErrorFormat( "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}", rawSetting, settingName, userSet); - } + } m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet); @@ -942,7 +942,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user)) - return false; + return false; // Ordinarily, if you can view it, you can edit it // There is no viewing a no mod script @@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1377,11 +1377,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); - if (m_bypassPermissions) return m_bypassPermissionsValue; + if (m_bypassPermissions) return m_bypassPermissionsValue; if (objectID == UUID.Zero) // User inventory { @@ -1472,7 +1472,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1609,7 +1609,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCreateUserInventory(int invType, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1619,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID)) return false; - return true; + return true; } /// @@ -1627,27 +1627,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCopyUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } /// /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. /// /// /// - /// + /// private bool CanEditUserInventory(UUID itemID, UUID userID) - { + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; + return true; } /// @@ -1655,14 +1655,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanDeleteUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } private bool CanTeleport(UUID userID, Scene scene) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index e0331d3..58e4261 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName) { SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName); - } + } public SceneObjectGroup DeserializeGroupFromXml2(string xmlString) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 373b6ab..799a448 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests { m_serialiserModule = new SerialiserModule(); m_scene = SceneSetupHelpers.SetupScene(""); - SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); + SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); } [Test] @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } @@ -325,8 +325,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests // TODO: More checks Assert.That(uuid, Is.EqualTo(rpUuid)); Assert.That(name, Is.EqualTo(rpName)); - Assert.That(creatorId, Is.EqualTo(rpCreatorId)); - } + Assert.That(creatorId, Is.EqualTo(rpCreatorId)); + } [Test] public void TestDeserializeXml2() @@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests string xml2 = m_serialiserModule.SerializeGroupToXml2(so); XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); - xtr.ReadStartElement("SceneObjectGroup"); + xtr.ReadStartElement("SceneObjectGroup"); xtr.ReadStartElement("SceneObjectPart"); UUID uuid = UUID.Zero; @@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 6cc0ed9..796b382 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -33,9 +33,9 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.CoreModules.World.Sound -{ +{ public class SoundModule : IRegionModule, ISoundModule - { + { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Scene m_scene; @@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags); - } + } } public virtual void TriggerSound( @@ -84,12 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendTriggeredSound( soundId, ownerID, objectID, parentID, handle, position, (float)gain); - } + } } } } diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs index aa38c09..0712a7f 100644 --- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs +++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules m_DayLengthHours = config.Configs["Sun"].GetDouble("day_length", d_day_length); // Horizon shift, this is used to shift the sun's orbit, this affects the day / night ratio - // must hard code to ~.5 to match sun position in LL based viewers + // must hard code to ~.5 to match sun position in LL based viewers m_HorizonShift = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night); @@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules receivedEstateToolsSunUpdate = true; // Generate shared values - GenSunPos(); + GenSunPos(); // When sun settings are updated, we should update all clients with new settings. SunUpdateToAllClients(); diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs index a09315a..c2ad7b8 100644 --- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation protected Scene m_scene; protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree }; - public PCode[] CreationCapabilities { get { return creationCapabilities; } } + public PCode[] CreationCapabilities { get { return creationCapabilities; } } public void Initialise(Scene scene, IConfigSource source) { @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) { if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0) - { + { m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name); return null; } @@ -111,6 +111,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation tree.Scale = new Vector3(4, 4, 4); break; } - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 41d2071..dcfb5a6 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins { m_windSpeeds[y * 16 + x] = m_curPredominateWind; } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 2c371da..071e20b 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins m_windSpeeds[y * 16 + x].Y *= m_strength; } } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b442f6f..3283c1f 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules } avatar.ControllingClient.SendWindData(windSpeeds); - } + } } private void SendWindAllClients() -- cgit v1.1 From 606e831ff5337fb5e94dcebf9d6852bd4c434d4b Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 09:38:36 +0900 Subject: Formatting cleanup. --- OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs | 2 +- .../CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs | 4 ++-- .../CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | 2 +- OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs | 2 +- OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/CoreModules/World/Sound/SoundModule.cs | 2 +- OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) (limited to 'OpenSim/Region/CoreModules') diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs index 413c6e8..ebebaf9 100644 --- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs @@ -185,7 +185,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog m_log.InfoFormat( "[DIALOG]: Sending alert in region {0} to {1} {2} with message {3}", - m_scene.RegionInfo.RegionName, firstName, lastName, message); + m_scene.RegionInfo.RegionName, firstName, lastName, message); SendAlertToUser(firstName, lastName, message, false); } } diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs index a73f868..a822d10 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveUtils.cs @@ -58,7 +58,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// User id to search /// /// - /// The path to the required folder. + /// The path to the required folder. /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. /// /// null if the folder is not found @@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver /// The folder from which the path starts /// /// - /// The path to the required folder. + /// The path to the required folder. /// It this is empty or consists only of the PATH_DELIMTER then this folder itself is returned. /// /// null if the folder is not found diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 734230c..d9a021f 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs @@ -169,7 +169,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer byte[] copyIDBytes = copyID.GetBytes(); im.binaryBucket = new byte[1 + copyIDBytes.Length]; im.binaryBucket[0] = (byte)AssetType.Folder; - Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); + Array.Copy(copyIDBytes, 0, im.binaryBucket, 1, copyIDBytes.Length); if (user != null && !user.IsChildAgent) { diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index d9f377b..05d19a2 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -508,7 +508,7 @@ namespace OpenSim.Region.CoreModules.World.Land scene.WestBorders[0].TriggerRegionY = conn.RegionScene.RegionInfo.RegionLocY; } - /* + /* else { conn.RegionScene.NorthBorders[0].BorderLine.Z += (int)Constants.RegionSize; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index b09c7a1..a9e0b7f 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions //private uint PERM_MODIFY = (uint)16384; private uint PERM_MOVE = (uint)524288; private uint PERM_TRANS = (uint)8192; - private uint PERM_LOCKED = (uint)540672; + private uint PERM_LOCKED = (uint)540672; /// /// Different user set names that come in from the configuration file. diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 796b382..37f1f2e 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -90,6 +90,6 @@ namespace OpenSim.Region.CoreModules.World.Sound p.ControllingClient.SendTriggeredSound( soundId, ownerID, objectID, parentID, handle, position, (float)gain); } - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index dcfb5a6..9d47e19 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -46,7 +46,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins private float m_avgStrength = 5.0f; // Average magnitude of the wind vector private float m_avgDirection = 0.0f; // Average direction of the wind in degrees - private float m_varStrength = 5.0f; // Max Strength Variance + private float m_varStrength = 5.0f; // Max Strength Variance private float m_varDirection = 30.0f;// Max Direction Variance private float m_rateChange = 1.0f; // -- cgit v1.1