| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Prevent a nasty deadlock on teleport | Melanie | 2011-12-12 | 1 | -24/+22 |
| | | |||||
| * | Make m_attachments private | Melanie | 2011-12-12 | 1 | -1/+1 |
| | | |||||
| * | Remove spammy log messages when querying sim health | Melanie | 2011-12-12 | 2 | -10/+14 |
| | | |||||
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie | 2011-12-12 | 10 | -266/+184 |
| |\ | |||||
| | * | Merge branch 'master' into careminster | Melanie | 2011-12-12 | 10 | -266/+184 |
| | |\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionInfo.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and ↵ | Dan Lake | 2011-12-12 | 6 | -50/+57 |
| | | | | | | | | | | | | | IsColliding | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-12-12 | 3 | -191/+72 |
| | | |\ | |||||
| | | | * | Mantis 5816: osParseJSON Decoding Problems | nebadon | 2011-12-11 | 3 | -191/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | osParseJSON uses hand-crafted decoding that has two issues * does not seem to handle top-level JSON lists * does not seem to handle unicode text thanks otakup0pe! | ||||
| | | * | | Added an option for extra settings within region ini file. Any non-hardcoded ↵ | Dan Lake | 2011-12-12 | 1 | -20/+55 |
| | | |/ | | | | | | | | | | key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo | ||||
| * | | | Send changed animation event asynchronously | Melanie | 2011-12-12 | 1 | -14/+17 |
| |/ / | |||||
| * | | Fix a regression that causes data from the attachments module to fail loading | Melanie | 2011-12-10 | 2 | -14/+7 |
| | | | |||||
| * | | Prevent spurious error message when client tries to move a null item | Melanie | 2011-12-10 | 2 | -119/+143 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 5 | -0/+18 |
| |\ \ | |/ | |||||
| | * | Implement handler for TeleportCancel inbound packet | Melanie | 2011-12-10 | 5 | -0/+18 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-10 | 11 | -105/+58 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | ||||
| | * | minor: remove a mono compiler warning | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | Print out one log message for every missing baked texture, rather than two. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -22/+4 |
| | | | |||||
| | * | minor: comment out "unpacked appearance" log mesasge for now | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -1/+1 |
| | | | |||||
| | * | Do some clean up Scene.cs log messages. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -24/+38 |
| | | | | | | | | | | | This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows. This also uses m_log.*Format() which is more efficient than string concat. | ||||
| | * | Get rid of IScene.PresenceChildStatus() which always had to execute a lookup ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 7 | -57/+16 |
| | | | | | | | | | in favour of IClientAPI.ISceneAgent.IsChildAgent instead. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2011-12-09 | 6 | -16/+106 |
| |\ \ | |/ | |||||
| | * | remove some unused fields in ScenePresence | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+0 |
| | | | |||||
| | * | Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi. | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+5 |
| | | | |||||
| | * | Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that ↵ | Justin Clark-Casey (justincc) | 2011-12-09 | 1 | -4/+6 |
| | | | | | | | | | | | | | it doesn't trigger an exception if the item hasn't been found. In this situation we will now put out a slightly more meaningful log error message instead. | ||||
| | * | Add commented log lines to FetchInventoryDescendents2 path for future use. | Justin Clark-Casey (justincc) | 2011-12-09 | 3 | -4/+95 |
| | | | | | | | | | Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost | ||||
| * | | Restore the Avination way of position and angle calculation so resizers | Melanie | 2011-12-09 | 1 | -5/+2 |
| | | | | | | | | | work again. | ||||
| * | | Fix llGetLinkKey to report avatars properly | Melanie | 2011-12-09 | 1 | -19/+0 |
| | | | |||||
| * | | Merge branch 'master' into bigmerge | Melanie | 2011-12-09 | 10 | -279/+323 |
| |\ \ | |/ | |||||
| | * | Revert "Revert "Stop performing the asset save part of baked texture ↵ | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | | uploading on the UploadBakedTexture cap asynchronously."" This turned out not to be the upload texture issue. This reverts commit 8721841fc3944ce0cdf5ce76297e73f9ed269751. | ||||
| | * | Don't reply with an ack packet if the client is not authorized. | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -45/+31 |
| | | | |||||
| | * | Extend TestAddClient() to check that the first packet received is an ack packet | Justin Clark-Casey (justincc) | 2011-12-08 | 3 | -93/+116 |
| | | | |||||
| | * | Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite | Justin Clark-Casey (justincc) | 2011-12-08 | 1 | -1/+1 |
| | | | |||||
| | * | Reactivate BasicCircuitTests.TestAddClient() | Justin Clark-Casey (justincc) | 2011-12-08 | 4 | -125/+167 |
| | | | | | | | | | This checks that the initial UseCircuitCode packet is handled correctly for a normal client login. | ||||
| | * | Remove unnecessary AgentCircuitData null check from Scene.AddNewClient(). | Justin Clark-Casey (justincc) | 2011-12-08 | 4 | -19/+10 |
| | | | | | | | | | | | The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists. This allows us to eliminate another null check elsewhere and simplifies the method contract | ||||
| | * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-12-08 | 2 | -3/+1 |
| | | | |||||
| * | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-12-08 | 1 | -26/+14 |
| |\ \ | | | | | | | | | | into bigmerge | ||||
| | * | | 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 | 14 | -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 | ||||
| | | * | 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 | ||||
| | * | | Adapt to justincc's remote admin refactor | Melanie | 2011-12-08 | 1 | -1744/+1394 |
| | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |