aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-12-076-62/+53
| | | |\ \ \ \ \
| | | * | | | | | Update libomv to 0.9.1BlueWall2011-12-074-0/+0
| | | | | | | | |
| | | * | | | | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0761-134/+821
| | | |\ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-0522-243/+355
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-5/+85
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-022-23/+28
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-023-29/+35
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-12-028-244/+430
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Make fix to Nini for null references in some cases.BlueWall2011-11-291-0/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Implement XMLRPCAdmin command admin_teleport_agent.Justin Clark-Casey (justincc)2011-12-075-5/+157
| | | |_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
| | * | | | | | | | | | | | properly lock CapsHandlers.m_capsHandlersJustin Clark-Casey (justincc)2011-12-071-26/+40
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Stop also adding an ordinary http handler when we set up a poll http handler.Justin Clark-Casey (justincc)2011-12-075-36/+13
| | | |_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
| | * | | | | | | | | | | Stop accidentally setting up the UploadTexture caps handler with the same ↵Justin Clark-Casey (justincc)2011-12-062-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | url for all users This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures. This hopefully resolves the recent UploadTexture LLSD problems This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
* | | | | | | | | | | | | Recover from an internal mess-up in the outgoing packet queues by creatingMelanie2011-12-081-19/+36
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a new queue object.
* | | | | | | | | | | | Fix intersim object give messagesMelanie2011-12-071-0/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Fix up intersim give messagingMelanie2011-12-071-1/+41
| | | | | | | | | | | |
* | | | | | | | | | | | Fix task inventory givingMelanie2011-12-074-56/+39
| | | | | | | | | | | |
* | | | | | | | | | | | Remove harmless merge artefactMelanie2011-12-061-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Fix phantom and temp flags not takingMelanie2011-12-062-2/+10
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-066-27/+436
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Revert "Stop performing the asset save part of baked texture uploading on ↵Justin Clark-Casey (justincc)2011-12-061-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the UploadBakedTexture cap asynchronously." This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..." Needs more investigation. This reverts commit 1854c52ea3c60d0a47f9793a7f5ec405e15489ca.
| * | | | | | | | | | | Make "show appearance" a synonym for "appearance show"Justin Clark-Casey (justincc)2011-12-061-2/+8
| | | | | | | | | | | |
| * | | | | | | | | | | In "appearance show", if a particular avatar is specified, print out texture ↵Justin Clark-Casey (justincc)2011-12-061-5/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UUID for each bake type and whether the simulator can find it.
| * | | | | | | | | | | Actually send the avatar data if an individual avatar is specified, rather ↵Justin Clark-Casey (justincc)2011-12-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than accidentally doing nothing
| * | | | | | | | | | | Allow "appearance show" command to take an optional avatar nameJustin Clark-Casey (justincc)2011-12-061-8/+40
| | | | | | | | | | | |
| * | | | | | | | | | | Make it possible to manually send appearance information via the "appearance ↵Justin Clark-Casey (justincc)2011-12-061-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send" command for a chosen avatar as well as all
| * | | | | | | | | | | Provide feedback as to which avatars are resending appearance informion on ↵Justin Clark-Casey (justincc)2011-12-061-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "appearance send" console command
| * | | | | | | | | | | Add test for not found response from GetTexture cap handler.Justin Clark-Casey (justincc)2011-12-054-0/+303
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
* | | | | | | | | | | | Adapt GodsModule to core changesMelanie2011-12-051-2/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Remove erroneous message about hyperlinks when entering an invalid region nameMelanie2011-12-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in map search.
* | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0556-104/+384
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-12-054-65/+67
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0556-104/+384
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | Add the proper result code as per the LL announcement for ↵Melanie2011-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | llTransferLindenDollars
* | | | | | | | | | | | Serialize the Volume Detect fieldMelanie2011-12-052-3/+9
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-051-14/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-12-051-14/+25
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | For the GetTexture capability, if a data range is requested that covers the ↵Justin Clark-Casey (justincc)2011-12-051-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whole asset length, return HTTP PartialContent instead of NotFound NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present. We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour https://issues.apache.org/bugzilla/show_bug.cgi?id=51878 Viewer 3.2.2 and very probably earlier appear happy with this. Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
| * | | | | | | | | | | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-65/+67
| |/ / / / / / / / / /
* | | | | | | | | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵Melanie2011-12-054-66/+67
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into bigmerge
| * | | | | | | | | | | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-054-66/+67
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into bigmergeMelanie2011-12-0527-452/+825
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| / / / / / / / / / / | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | | | HG: Added HEAD method to Helo service. This is the preferred method, but its ↵Diva Canto2011-12-042-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * | | | | | | | | | HG: Renamed one methodDiva Canto2011-12-045-5/+5
| | | | | | | | | | |
| * | | | | | | | | | Split up test SceneHelpers to provide an AddChildScenePresence() callJustin Clark-Casey (justincc)2011-12-032-10/+26
| | | | | | | | | | |
| * | | | | | | | | | Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() ↵Justin Clark-Casey (justincc)2011-12-031-70/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since they don't do anything useful.
| * | | | | | | | | | Extend TestCreateChildScenePresence to make assertions both at CreateAgent ↵Justin Clark-Casey (justincc)2011-12-031-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stage and then at Scene.AddClient()
| * | | | | | | | | | Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-038-29/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate. Normal standalone operation unaffected.
| * | | | | | | | | | Improve locking in AgentCircuitManagerJustin Clark-Casey (justincc)2011-12-031-25/+41
| | | | | | | | | | |
| * | | | | | | | | | Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID ↵Justin Clark-Casey (justincc)2011-12-033-42/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions