aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-272-5/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * In remote QueryAccess, also receive the actual status (true|false) instead ↵Justin Clark-Casey (justincc)2012-05-251-2/+5
| | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | lookup rather than the region handle.
* | Merge branch 'master' into careminsterMelanie2012-03-141-7/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-02-231-3/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-3/+7
| | | | | | | | | | | | 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 bigmergeMelanie2011-12-051-2/+2
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-051-2/+2
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-11-191-4/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for ↵Justin Clark-Casey (justincc)2011-11-191-2/+2
| | | | | | | | | | | | | | SendCreateChildAgent" message This is misleading since a simulator will call this method before successfully trying remote regions. Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
| * Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent ↵Justin Clark-Casey (justincc)2011-11-191-2/+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 branch 'master' into careminster-presence-refactorMelanie2011-05-131-0/+2
|\ \ | |/
| * This makes compression of fatpacks actually work. Previously they always ↵Diva Canto2011-05-111-3/+2
| | | | | | | | failed. See comment in WebUtil.
| * Revert "Functional improvement: close the stream. Non-functional: add debug ↵Diva Canto2011-05-111-19/+2
| | | | | | | | | | | | messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs." This reverts commit 5548f837501184d68c352097ad1a1de566e18ca0.
| * One more debug message. Don't use this unless your name is nebadon.Diva Canto2011-05-111-0/+3
| |
| * Functional improvement: close the stream. Non-functional: add debug messages ↵Diva Canto2011-05-111-2/+19
| | | | | | | | to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs.
| * Also compress the actual fatpacksMelanie2011-05-082-94/+171
| |
| * Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+0
| | | | | | | | of no return.
| * Enable compressed (gzip) fatpack transfers.Melanie2011-05-082-131/+191
| |
* | Also compress the actual fatpacksMelanie2011-05-082-94/+171
| |
* | Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+0
| | | | | | | | of no return.
* | Enable compressed (gzip) fatpack transfers.Melanie2011-05-082-131/+191
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-3/+6
|\ \ | |/
| * Fatpack message on agent transfers: 1 message only (UpdateAgent) containing ↵Diva Canto2011-04-281-3/+6
| | | | | | | | 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.
| * Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-2/+9
| |
* | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-2/+9
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-121-0/+5
|\ \ | |/
| * Comment previous debugDiva Canto2011-02-081-3/+3
| |
| * XFF header again -- debug.Diva Canto2011-02-081-0/+5
| |
| * Fix a typo in the QUERYACCESS method nameMelanie2011-02-051-1/+1
| |
| * Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
| |
* | Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
| |
* | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-271-1/+1
| | | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-1/+1
|\ \ | |/
| * remove some mono compiler warnings and unnecessary dictionary instantiationsJustin Clark-Casey (justincc)2011-01-211-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-4/+13
|\ \ | |/
| * Account for some component along the way lower-casing the HTTP header keys. ↵Diva Canto2011-01-171-13/+10
| | | | | | | | (XFF header issue)
| * Brute force debug for XFF issueDiva Canto2011-01-171-0/+7
| |
| * More debug messages to help track the XFF header problem.Diva Canto2011-01-171-0/+3
| |
| * Improved debug messages to track what is going on with the XFF headerDiva Canto2011-01-091-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-20/+31
|\ \ | |/
| * Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+26
| | | | | | | | whether or not an agent is allowed there as a root agent.
| * Added an exception handler on CreateObject handler, just in case there's an ↵Diva Canto2010-12-071-20/+31
| | | | | | | | exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
| * Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+26
| | | | | | | | whether or not an agent is allowed there as a root agent.
* | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
| | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-1/+21
|\ \ | |/
| * Made the Gatekeeper proxy-able.Diva Canto2010-10-031-1/+21
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-18/+1
|\ \ | |/
generated by cgit v1.1 at 2024-12-18 15:14:21 +0000