| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-10 | 1 | -11/+32 |
| |\ | |||||
| | * | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-08 | 1 | -4/+49 |
| |\ \ | |/ | |||||
| | * | llClientView: try to have only one thread per client processing | UbitUmarov | 2012-09-08 | 1 | -4/+49 |
| | | | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not) | ||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 1 | -4/+6 |
| |\ \ | |/ | |||||
| | * | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-04 | 2 | -2/+9 |
| |\ \ | |/ | |||||
| | * | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 2 | -2/+9 |
| | | | | | | | | | flight. FS 4.2.2 does not. | ||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-01 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 1 | -0/+1 |
| | | | | | | | | | movement lag. | ||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-30 | 1 | -11/+126 |
| |\ \ | |/ | |||||
| | * | Fix issue with the quit packet being stuck int he queue and a one packet delay. | Melanie | 2012-08-29 | 1 | -2/+8 |
| | | | | | | | | | Also fix semaphore excetion caused by enqueueing while dequque is taking place. | ||||
| | * | Remove Justin's addition to avoid sending incoming packets to inactive clients | Melanie | 2012-08-29 | 1 | -9/+9 |
| | | | | | | | | | | | This also causes the initial AgentUpdate to be rejected because our processing is asynchronous. | ||||
| | * | Add a queue with two priority levels. This is a drop in replacement for | Melanie | 2012-08-28 | 1 | -2/+111 |
| | | | | | | | | | the BlockingQueue from OMV, but allows two priorities. | ||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-25 | 3 | -50/+111 |
| |\ \ | |/ | |||||
| | * | Remove debug spam | Melanie | 2012-08-24 | 1 | -2/+2 |
| | | | |||||
| | * | Fix background inventory loading (Viewer 3) so it won't lag out the sim | Melanie | 2012-08-24 | 1 | -49/+103 |
| | | | |||||
| | * | Allow updates sent for right pec to go to the client | Melanie | 2012-08-21 | 1 | -1/+1 |
| | | | |||||
| | * | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 1 | -0/+7 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-16 | 3 | -4/+243 |
| |\ \ | |/ | |||||
| | * | Actually add the module | Melanie | 2012-08-14 | 1 | -0/+234 |
| | | | |||||
| | * | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 2 | -4/+9 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| | | * | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -4/+9 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | | | * | Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -4/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini | ||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-04 | 1 | -2/+0 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | ||||
| | * | | | Remove another superflouous IsActive set | Melanie | 2012-08-03 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -2/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Remove a merge artefaci in IsActive handling and restore commented out ↵ | Melanie | 2012-08-03 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | correct one | ||||
| * | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-08-03 | 1 | -3/+3 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | clientview IsActive use is broken. Suspend it's use keeping it true ( to | UbitUmarov | 2012-08-03 | 1 | -3/+3 |
| | |/ / | | | | | | | | | | review later) | ||||
| * | | | merge crap gerge branch 'ubitwork' of ↵ | ubit | 2012-08-02 | 4 | -35/+64 |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into ubitwork Conflicts: bin/Regions/Regions.ini.example bin/lib32/BulletSim.dll bin/lib32/libBulletSim.so bin/lib64/BulletSim.dll bin/lib64/libBulletSim.so | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 3 | -4/+4 |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml | ||||
| | | * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 2 | -2/+2 |
| | | | | | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules. | ||||
| | | * | Add experimental "OpenSim object memory churn" statistics to output of ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it. | ||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 1 | -1/+2 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| | | * | Extend region console "show queues" command to show already collected time ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -1/+2 |
| | | | | | | | | | | | | | since last packeted received by the simulator from a viewer. | ||||
| | * | | Merge branch 'avination' into careminster | Melanie | 2012-07-23 | 1 | -1/+1 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'avination' into careminster | Melanie | 2012-07-20 | 1 | -3/+7 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-20 | 2 | -30/+58 |
| | |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | | * | | | Make LLClientView instant message handling asynchronous rather than ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synchronous to prevent long operations from holding up all inbound packet processing. Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service. Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid. I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages. Thanks to Nebadon for testing this change out. | ||||
| | | * | | | Prevent race conditions between two threads that call LLClientView.Close() ↵ | Justin Clark-Casey (justincc) | 2012-07-19 | 2 | -30/+57 |
| | | | | | | | | | | | | | | | | | | | | | simultaneously (e.g. ack timeout and an attempt to reconnect) | ||||
| * | | | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-23 | 2 | -4/+8 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | Fix double-ping on logout by not sending a stop packet to the client | Melanie | 2012-07-21 | 1 | -1/+1 |
| | | |_|/ | |/| | | | | | | | | | | if the client told us it wants to log out in the first place. | ||||
| | * | | | Fix slow loading of task inventory | Melanie | 2012-07-19 | 1 | -3/+7 |
| | |/ / | |||||
| * | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-07-17 | 21 | -312/+485 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 1 | -8/+63 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 2 | -30/+3 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | | * | | Stop redundantly passing in the endpoint to the LLClientView constructor. | Justin Clark-Casey (justincc) | 2012-07-12 | 2 | -5/+2 |
| | | | | | | | | | | | | | | | | | This can always be retrieved via the LLUDPClient and is so done in various places already. | ||||
| | | * | | Remove IClientIPEndpoint client interface for now. | Justin Clark-Casey (justincc) | 2012-07-12 | 1 | -20/+1 |
| | | | | | | | | | | | | | | | | | | | | | This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor. Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address. | ||||
| | | * | | Remove IClientAPI.GetClientEP() in favour of existing identical ↵ | Justin Clark-Casey (justincc) | 2012-07-12 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | IClientAPI.RemoteEndpoint. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |