| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-12-08 | 1 | -26/+14 |
| |\ | | | | | | | into bigmerge | ||||
| | * | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 0 | -0/+0 |
| | |\ | |||||
| | * | | Remove superfluous try block | Melanie | 2011-12-08 | 1 | -27/+14 |
| | | | | |||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 13 | -100/+203 |
| |\ \ \ | |_|/ |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | When a client connects to a scene, send other avatar appearance data ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | asynchronously to reduce hold up in the IN UDP packet processing loop. This is already being done for the initial object data send. | ||||
| | * | | On a new client circuit, send the initial reply ack to let the client know ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 13 | -78/+171 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | it's live before sending other data. This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before. This may stop some avatars appearing grey on login. This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces | ||||
| | * | | Simplify Scene.AddNewClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -17/+28 |
| | | | | | | | | | | | | | | | | If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway. So instead retain the check/create ScenePresence reference and use this. | ||||
| * | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -1/+0 |
| |\ \ \ | |/ / | | / | |/ |/| | |||||
| | * | Remove a left over log output | Melanie | 2011-12-08 | 1 | -2/+1 |
| | | | |||||
| * | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-12-08 | 19 | -1742/+1515 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into bigmerge | Melanie | 2011-12-08 | 1 | -3/+3 |
| | |\ \ | | |/ | |||||
| | | * | Remove warning in admin_save_oar xmlrpc method where noassets == true was ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1/+1 |
| | | | | | | | | | | | | | comparing against an object rather than a string | ||||
| | | * | Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -2/+2 |
| | | | | | | | | | | | | | success = true on success rather than false | ||||
| | * | | Adapt to justincc's remote admin refactor | Melanie | 2011-12-08 | 1 | -1744/+1394 |
| | | | | |||||
| | * | | Merge commit 'fb2f4f158c42ecfea114eb7cefd9074dc001626f' into bigmerge | Melanie | 2011-12-08 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -1711/+1370 |
| | | | | | | | | | | | | | of code to do password checks, etc., instead of copy/pasting this code into every method | ||||
| | * | | Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge | Melanie | 2011-12-08 | 19 | -106/+229 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | | * | Remove unused SceneManager.TryGetAvatarsScene() | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -20/+0 |
| | | | | | | | | | | | | | | | | It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list | ||||
| | | * | On an Exception in Scene.RemoveClient(), always remove the client (and SP) ↵ | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -19/+28 |
| | | | | | | | | | | | | | structure so that logout on unexpired packets isn't retriggered, causing the same exception | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-12-07 | 6 | -0/+1 |
| | | |\ | |||||
| | | | * | Trigger a Jenkins build | BlueWall | 2011-12-07 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-12-07 | 6 | -62/+53 |
| | | | |\ | |||||
| | | | * | | Update libomv to 0.9.1 | BlueWall | 2011-12-07 | 4 | -0/+0 |
| | | | | | | |||||
| | | | * | | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-07 | 61 | -134/+821 |
| | | | |\ \ | |||||
| | | | * \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-05 | 22 | -243/+355 |
| | | | |\ \ \ | |||||
| | | | * \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 3 | -5/+85 |
| | | | |\ \ \ \ | |||||
| | | | * \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 2 | -23/+28 |
| | | | |\ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 3 | -29/+35 |
| | | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2011-12-02 | 8 | -244/+430 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | Make fix to Nini for null references in some cases. | BlueWall | 2011-11-29 | 1 | -0/+0 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Implement XMLRPCAdmin command admin_teleport_agent. | Justin Clark-Casey (justincc) | 2011-12-07 | 5 | -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_capsHandlers | Justin Clark-Casey (justincc) | 2011-12-07 | 1 | -26/+40 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | Stop also adding an ordinary http handler when we set up a poll http handler. | Justin Clark-Casey (justincc) | 2011-12-07 | 5 | -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-06 | 2 | -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 creating | Melanie | 2011-12-08 | 1 | -19/+36 |
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | a new queue object. | ||||
| * | | | | | | | | Fix intersim object give messages | Melanie | 2011-12-07 | 1 | -0/+6 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix up intersim give messaging | Melanie | 2011-12-07 | 1 | -1/+41 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix task inventory giving | Melanie | 2011-12-07 | 4 | -56/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | Remove harmless merge artefact | Melanie | 2011-12-06 | 1 | -1/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Fix phantom and temp flags not taking | Melanie | 2011-12-06 | 2 | -2/+10 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-06 | 6 | -27/+436 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Revert "Stop performing the asset save part of baked texture uploading on ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -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-06 | 1 | -2/+8 |
| | | | | | | | | | |||||
| | * | | | | | | | In "appearance show", if a particular avatar is specified, print out texture ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -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-06 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than accidentally doing nothing | ||||
| | * | | | | | | | Allow "appearance show" command to take an optional avatar name | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -8/+40 |
| | | | | | | | | | |||||
| | * | | | | | | | Make it possible to manually send appearance information via the "appearance ↵ | Justin Clark-Casey (justincc) | 2011-12-06 | 1 | -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-06 | 1 | -2/+11 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "appearance send" console command | ||||
| | * | | | | | | | Add test for not found response from GetTexture cap handler. | Justin Clark-Casey (justincc) | 2011-12-05 | 4 | -0/+303 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite | ||||
| * | | | | | | | | Adapt GodsModule to core changes | Melanie | 2011-12-05 | 1 | -2/+2 |
| | | | | | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |