aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-271-0/+10
| | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
* Merge branch 'master' into careminsterMelanie2013-07-181-58/+13
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * Guard against unauthorized agent deletes.Diva Canto2013-07-131-4/+3
| |
| * Deleted GET agent all around. Not used.Diva Canto2013-07-131-35/+0
| |
* | Merge branch 'master' into careminsterMelanie2013-06-231-9/+22
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Change IsLocalRegion from using region handle to using regionID. This was ↵Diva Canto2013-06-221-1/+1
| | | | | | | | affecting UpdateAgent and CloseAgent in cases where the foreign region is on the same coordinates as *some* local region.
| * Finally moved HG agent transfers to use agent fatpacks.Diva Canto2013-06-211-8/+21
| |
* | Merge branch 'master' into careminsterMelanie2012-12-091-1/+1
|\ \ | |/
| * Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | unknown maybe due to timeout. mantis #6450
| * Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+14
| |
* | Make friend notifies and closing child agents async because both canMelanie2012-09-041-10/+11
| | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
* | Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+15
| |
* | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| |
* | Merge branch 'avination' into careminsterMelanie2012-06-111-0/+4
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs OpenSim/Services/Connectors/Simulation/SimulationDataService.cs OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
| * | Add the ability to query the MYSQL databse for a list of the stored prim UUIDsMelanie2012-06-071-0/+5
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-272-14/+41
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Fix bug where a failed QueryAccess to a remove region would always have the ↵Justin Clark-Casey (justincc)2012-05-251-13/+20
| | | | | | | | reason "Communications failure" no matter what the destination region actually returned
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-0/+4
| | | | | | | | | | | | | | | | | | | | of always true no matter what the callee actually returned. This was due to two things 1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"]. But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what 2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result. The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
| * Make ISimulationScene.GetScene() used the more efficient region id for ↵Justin Clark-Casey (justincc)2012-05-241-1/+1
| | | | | | | | lookup rather than the region handle.
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-02-231-1/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-1/+2
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-02-201-6/+17
|\ \ | |/
| * Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
| |
| * More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-201-6/+14
| | | | | | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail.
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-1/+4
| | | | | | | | crossings
* | Merge branch 'master' into bigmergeMelanie2011-11-191-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-1/+1
| | | | | | | | | | | | | | 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them. Also finally get the deregister grid service message working properly
* | Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-1/+6
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-1/+6
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-6/+21
|\ \ | |/
| * Fixed an issue with the response of CreateAgent over the SimulationConnector.Diva Canto2011-05-281-6/+21
| |
| * Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
| * Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Also compress the actual fatpacksMelanie2011-05-081-1/+6
| |
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| |
* | Attempt to make teleports more reliable. This may break redirection on loginMelanie2011-05-031-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-16/+19
|\ \ | |/
| * Increased timeout for fat UpdateAgent to 200secs. Nebadon's 3800-prim alien ↵Diva Canto2011-05-021-1/+1
| | | | | | | | avatar takes 6secs to transfer between sims on the same machine...
| * Turns out that it's a bad idea to let Agent position updates linger for a ↵Diva Canto2011-05-021-7/+7
| | | | | | | | long time on certain versions of mono. It's better to abort them if they take too long. So timeout is now an argument. Currently: 20secs for CreateAgent, 100secs for UpdateAgent (fat), 10 secs for UpdateAgent (Position); all of these divided by 4, for ReadWrite, as Mic had before.
| * Fixed confusing OSDMap that comes as the response of QueryAccess in the case ↵Diva Canto2011-05-011-9/+12
| | | | | | | | it fails.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-7/+12
|\ \ | |/
| * Minor improvement in version checking (Simulation service)Diva Canto2011-04-291-1/+1
| |
| * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-281-7/+12
| | | | | | | | the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-061-0/+5
|\ \ | |/
| * Make the "All Estates" option work from the client (this makes chosen ↵Justin Clark-Casey (justincc)2011-04-051-0/+5
| | | | | | | | | | | | | | | | changes to all the estates that the user owns). This applies to adding/removing estate users, groups, managers and bans. This is the application of the AllEstates_0.5.patch from http://opensimulator.org/mantis/view.php?id=5420 Thanks very much, Snoopy!
* | Make the login service's call to the sim time out quicker so we have aMelanie2011-03-311-1/+1
| | | | | | | | chance to try fallback before the client quits
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-271-0/+10
|\ \ | |/
| * On initial region registration, if the user chooses the option to make the ↵Justin Clark-Casey (justincc)2011-03-211-0/+10
| | | | | | | | region part of an existing estate, then list the existing region names.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-3/+3
|\ \ | |/
generated by cgit v1.1 at 2024-12-21 10:06:09 +0000