aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster' into avinationMelanie2012-08-141-1/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * Merge branch 'master' into careminsterMelanie2012-08-141-1/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Exclude temp attachemnts from being sent to the avatar serviceMelanie2012-08-141-1/+2
| | |
* | | Merge branch 'careminster' into avinationMelanie2012-08-032-2/+4
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2012-08-032-2/+4
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * minor: Comment out "Deleting asset" log messages for nowJustin Clark-Casey (justincc)2012-08-032-2/+4
| | |
* | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
|/ /
* | Merge branch 'master' into careminsterMelanie2012-08-011-9/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Change exception log messages in XInventoryService connector to error rather ↵Justin Clark-Casey (justincc)2012-08-011-9/+8
| | | | | | | | | | | | than debug, since these signal real problems. Also outputs full exception instead of just the message to aid diagnostics.
* | Merge branch 'master' into careminsterMelanie2012-08-011-1/+1
|\ \ | |/
| * If we're fetching active gestures via the XInventoryServiceConnector, then ↵Justin Clark-Casey (justincc)2012-07-301-1/+1
| | | | | | | | properly look at the ITEMS dictionary already returned rather than the level above this.
* | Merge branch 'avination' into careminsterMelanie2012-07-161-5/+29
|\ \ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | be paranoic (?)UbitUmarov2012-07-111-0/+6
| | |
| * | Replace a Multicast Delegate by a simple list of delegates in access GetUbitUmarov2012-07-111-5/+23
| | | | | | | | | | | | | | | Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i do see what we want.
* | | Merge branch 'master' into careminsterMelanie2012-07-131-2/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ↵Justin Clark-Casey (justincc)2012-07-131-2/+1
| | | | | | | | | | | | | | | | | | the BOM, use a single Util.UTF8NoBomEncoding. This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
* | | Merge branch 'master' into careminsterMelanie2012-07-051-13/+43
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: add client name to various login service log messages to disambiguate ↵Justin Clark-Casey (justincc)2012-07-051-13/+43
| | | | | | | | | | | | | | | | | | messages from concurrent logins. Also adds destination resolution debug log message showing region endpoint. Adding endpoint to the log helps to find issues where the region external host information has been wrongly configured
* | | Merge branch 'master' into careminsterMelanie2012-07-014-27/+15
|\ \ \ | |/ /
| * | Remove some mono compiler warningsJustin Clark-Casey (justincc)2012-06-303-17/+15
| | |
| * | Removing unused handling of incoming create object by userID and itemID only.Justin Clark-Casey (justincc)2012-06-301-10/+0
| | | | | | | | | | | | | | | It appears this was never actually used since attachments were rezzed in other code. This was never available on remote simulator comms, only local.
* | | Merge branch 'master' into careminsterMelanie2012-06-281-22/+118
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * | Show region positions in "show regions" robust console commandJustin Clark-Casey (justincc)2012-06-261-1/+7
| | |
| * | minor: correct GridService "show regions" cibsike cinnabd usage statementJustin Clark-Casey (justincc)2012-06-261-1/+1
| | |
| * | Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.Justin Clark-Casey (justincc)2012-06-261-6/+5
| | | | | | | | | | | | Use these for new "show regions" command rather than old cumbersome stuff.
| * | Add "show regions" console command to ROBUST to show all regions currently ↵Justin Clark-Casey (justincc)2012-06-261-0/+44
| | | | | | | | | | | | | | | | | | registered. Command is not added in standalone, which has its own version of "show regions" that can also show estate name
| * | Add "show region at" command to grid service to get the details of a region ↵Justin Clark-Casey (justincc)2012-06-251-22/+69
| | | | | | | | | | | | | | | | | | | | | at a specific location. "show region" command becomes "show region name" to disambiguate This is the same format as used by "show object name", etc. "deregister region" also becomes "deregister region id"
* | | Merge branch 'master' into careminsterMelanie2012-06-141-0/+45
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Add "deregister region" by uuid command to grid service to allow manual ↵Justin Clark-Casey (justincc)2012-06-131-0/+45
| | | | | | | | | | | | | | | | | | deregistration of simulators. Useful if a simulator has crashed without removing its regions and those regions have been reconfigured differently
* | | Merge branch 'master' into careminsterMelanie2012-06-121-21/+7
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * | OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent ↵Justin Clark-Casey (justincc)2012-06-121-21/+7
| | | | | | | | | | | | | | | | | | | | | rather than scanning all scene for the presence with the right id Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions. This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
* | | 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-06-031-1/+1
|\ \ \ | | |/ | |/|
| * | Fix various issues with http inventoryJustin Clark-Casey (justincc)2012-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead. 2) Folders with links were including the linked items in the descendents figure, when only the links should be included. 3) Links and linked items in link folders were not being included in the return data, and not in the correct order. Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
* | | Merge branch 'avination' into careminsterMelanie2012-06-021-7/+10
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix impersonation, it got broken in a mergeMelanie2012-06-011-7/+10
| | |
* | | Merge branch 'master' into careminsterMelanie2012-05-275-30/+78
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-2/+12
| | | | | | | | | | | | 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>
| * | Add ConsoleDisplayList for more consistent formatting of console output in ↵Justin Clark-Casey (justincc)2012-05-231-9/+9
| | | | | | | | | | | | | | | | | | list form. Convert "show region" to use this structure rather than hand-constructing
| * | Add missing Y co-ord in "show region" console command informationJustin Clark-Casey (justincc)2012-05-231-1/+1
| | |
| * | Lay out "show region" information in an easier to read line by line formatJustin Clark-Casey (justincc)2012-05-231-9/+11
| | |
| * | minor: extend commented out LinkInventoryItem log message for future useJustin Clark-Casey (justincc)2012-05-211-3/+3
| | |
| * | Fix bug where outfit folders could not be renamed.Justin Clark-Casey (justincc)2012-05-211-4/+13
| | | | | | | | | | | | Outfit folders are a type of system folder whose details are allowed to change.
* | | Merge branch 'master' into careminsterMelanie2012-05-191-3/+9
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
| * | Fix issue where a new outfit folder is not created when a new outfit is ↵Justin Clark-Casey (justincc)2012-05-181-3/+9
| | | | | | | | | | | | | | | | | | saved if there are no previous outfits This was because AddFolder() was disallowing these though they are legal.
* | | Merge branch 'master' into careminsterMelanie2012-05-1015-0/+0
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-15 22:12:52 +0000