| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 2 | -17/+16 |
| |\ | |||||
| | * | Simplified IsInTransit property on ScenePresence and removed InTransit() ↵ | Dan Lake | 2011-10-06 | 2 | -17/+16 |
| | | | | | | | | | which called IsInTransit=true which called m_inTransit=true. Also removed NotInTransit(). | ||||
| * | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 8 | -109/+87 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | | HACK: Remove advanced property resending until it is fixed properly in core. | Melanie | 2011-10-12 | 1 | -10/+14 |
| | | | | |||||
| * | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2011-10-12 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | | | into bigmerge | ||||
| | * | | | Fix tree populator | Melanie | 2011-10-12 | 1 | -10/+0 |
| | | | | | |||||
| * | | | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 2 | -265/+266 |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Refactor ScenePresence so gets and sets are through properties. Added ↵ | Dan Lake | 2011-10-06 | 1 | -287/+288 |
| | | | | | | | | | | | | | private sets when needed. Removed redundant code when methods replicated what the set already does | ||||
| * | | | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+11 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Added back UserAccount that creates random UUID for new account. | BlueWall | 2011-10-05 | 1 | -0/+11 |
| | | | | | | | | | | | | | | | | This should fix recent issues with 3rd party apps that use the old interface w/o breaking the new one. | ||||
| * | | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmerge | Melanie | 2011-10-12 | 4 | -36/+21 |
| |\ \ \ | |/ / | |||||
| | * | | Instead of adding stat agentMS in all kinds of places, calculate it instead ↵ | Justin Clark-Casey (justincc) | 2011-10-06 | 4 | -36/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | in the main Scene.Update() loop, like the other stats Some of the places where agentMS was added were in separate threads launched by the update loop. I don't believe this is correct, since such threads are no longer contributing to frame time. Some of the places were also driven by client input rather than the scene loop. I don't believe it's appropriate to add this kind of stuff to scene loop stats. These changes hopefully have the nice affect of making the broken out frame stats actually add up to the total frame time | ||||
| * | | | Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmerge | Melanie | 2011-10-12 | 1 | -11/+11 |
| |\ \ \ | |/ / | |||||
| | * | | rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not ↵ | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -11/+11 |
| | | | | | | | | | | | | | a single one | ||||
| * | | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Add user ID to new estate user prompt, to make it clearer and consistent ↵ | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | with the main create user prompts | ||||
| * | | | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge | Melanie | 2011-10-12 | 1 | -34/+7 |
| |\ \ \ | |/ / | |||||
| | * | | Change WebStatsModule to check its config properly, instead of catching the ↵ | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -34/+7 |
| | | | | | | | | | | | | | | | | | | | ineviable NullReferenceException! Also, tidy up spacing. | ||||
| * | | | Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 |
| |\ \ \ | |/ / | |||||
| | * | | Remove unused local variable i from OdeScene.Simulate() | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -3/+0 |
| | | | | |||||
| * | | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge | Melanie | 2011-10-12 | 3 | -24/+36 |
| |\ \ \ | |/ / | |||||
| | * | | Make reported sim fps more accurate, in line with frame time ms | Justin Clark-Casey (justincc) | 2011-10-05 | 3 | -24/+36 |
| | |/ | | | | | | | Also remove some unused fields and improve naming on others. | ||||
| * | | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmerge | Melanie | 2011-10-12 | 1 | -21/+4 |
| |\ \ | |/ | |||||
| | * | Removed redundant scene presence lookups in HGMessageTransferModule | Dan Lake | 2011-10-05 | 1 | -21/+4 |
| | | | |||||
| * | | Merge commit '38d205502a83ed334d9827f43862579cec305639' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-04 | 6 | -18/+37 |
| | |\ | |||||
| * | \ | Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmerge | Melanie | 2011-10-12 | 1 | -7/+5 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/World/TreePopulator/TreePopulatorModule.cs | ||||
| | * | | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ↵ | Dan Lake | 2011-10-04 | 1 | -14/+2 |
| | | | | | | | | | | | | | objects already triggers objectkill packet to client. No need to send again. | ||||
| * | | | Merge commit '9a49b3b5197f41353c32443dbc5432a4bcd58958' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| | |\ \ | |||||
| * | \ \ | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 4 | -8/+28 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | When creating a new user on the comand line, give the option of allowing a ↵ | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -8/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership. | ||||
| * | | | | Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-10-04 | 6 | -393/+393 |
| | |\ \ \ | | |/ / | |||||
| * | | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Turn off keepalives when commands are specified | Mic Bowman | 2011-10-04 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Merge commit '8a216dc1ccdc336a22958cd476de034d065cf676' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -384/+385 |
| | |\ \ \ | | | |/ | | |/| | |||||
| * | | | | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge | Melanie | 2011-10-12 | 2 | -9/+8 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine]. | Justin Clark-Casey (justincc) | 2011-10-04 | 2 | -9/+8 |
| | | |/ | |/| | |||||
| * | | | Fix rezzing coalesced object broken by core merge | Melanie | 2011-10-12 | 1 | -54/+36 |
| | | | | |||||
| * | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge | Melanie | 2011-10-12 | 105 | -10275/+2555 |
| |\ \ \ | |||||
| | * \ \ | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 4 | -427/+409 |
| | |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | ||||
| | | * | | Removed all refs to IClientAPI from IAttachmentsModule. Separated client ↵ | Dan Lake | 2011-10-04 | 4 | -384/+385 |
| | | |/ | | | | | | | | | | handlers for attachments to call public interface and rearranged module file into sections | ||||
| | * | | Merge commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmerge | Melanie | 2011-10-11 | 0 | -0/+0 |
| | |\ \ | | |/ | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 5 | -68/+73 |
| | | |\ | |||||
| | * | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 6 | -135/+86 |
| | |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | | * | | Removed redundant code in AttachmentsModule and simplified interfaces which ↵ | Dan Lake | 2011-10-03 | 6 | -131/+83 |
| | | | | | | | | | | | | | | | | | converted back and forth between ScenePresence and IClientAPI. More to be done still. | ||||
| | * | | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| | |\ \ \ | | | |/ | | |/| | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |