aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-05-1015-0/+0
|\ \ | |/
| * Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect ↵Justin Clark-Casey (justincc)2012-05-0915-0/+0
| | | | | | | | | | | | | | | | the actual class names. This is usually because the file name was singular (*Service*) but the class name was plural (*Services*). This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector. This does not affect existing configuration since the files are being renamed rather than the classes.
* | Merge branch 'master' into careminsterMelanie2012-04-201-5/+20
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
| * Remember to dispose of the bitmap opened from a file in ↵Justin Clark-Casey (justincc)2012-04-201-4/+11
| | | | | | | | GatekeeperServiceConnector.GetMapImage()
* | Merge branch 'master' into careminsterMelanie2012-04-111-8/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * Add uri to various log messages when region registration fails. Upgrade ↵Justin Clark-Casey (justincc)2012-04-101-8/+15
| | | | | | | | some debug log messages to error.
* | Merge branch 'master' into careminsterMelanie2012-04-071-8/+39
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-8/+39
| |
* | Merge branch 'master' into careminsterMelanie2012-03-223-1/+61
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵Diva Canto2012-03-211-1/+8
| | | | | | | | the service connector.
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-212-0/+53
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
* | Merge branch 'master' into careminsterMelanie2012-03-213-12/+136
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-202-11/+76
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
| * Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-171-1/+60
| | | | | | | | direct user connections.
* | Merge branch 'master' into careminsterMelanie2012-03-141-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* | Merge branch 'master' into careminsterMelanie2012-03-091-3/+7
|\ \ | |/
| * More on inventory transfer hold ups:Diva Canto2012-03-091-3/+7
| | | | | | | | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+20
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG inventory/asset transfers: serialize asset posts. I'm using the same ↵Diva Canto2012-03-081-1/+20
| | | | | | | | pattern as suggested in the patch mantis #5921. Testing it in this smaller context to see how it works.
* | Add a cache on GridService requestsMelanie2012-02-241-0/+10
| |
* | 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.
* | Merge branch 'master' into careminsterMelanie2012-02-181-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends ↵Justin Clark-Casey (justincc)2012-02-161-1/+1
| | | | | | | | grid call would try and contact the wrong uri. Also fixes the build from df960d5
* | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-1/+4
| | | | | | | | crossings
* | Merge branch 'master' into careminsterMelanie2012-02-079-103/+120
|\ \ | |/
| * Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an ↵Justin Clark-Casey (justincc)2012-02-079-103/+120
| | | | | | | | exception in service connectors
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-162-0/+64
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-162-0/+64
| |
* | Merge branch 'master' into careminsterMelanie2012-01-071-1/+1
|\ \ | |/
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-01-071-1/+1
| |
* | Fix up asset stuffMelanie2012-01-061-0/+3
| |
* | Remove a dangling command registrationMelanie2012-01-051-4/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-01-061-39/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-43/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+54
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-031-0/+6
| |\
| * | Profile UpdatesBlueWall2012-01-031-0/+54
| | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | | Merge branch 'master' into careminsterMelanie2012-01-024-1/+10
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * | Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-021-0/+6
| |/ | | | | | | hunting. No functional changes.
| * Set the local grid flag in the user account through the simian connectorMic Bowman2011-12-291-0/+4
| | | | | | | | This should make bi-directional hypergrid work.
generated by cgit v1.1 at 2024-12-23 02:20:35 +0000