| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ \ | |/ / | ||||||
| | * | | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | OpenSim.ini.example | |||||
| * | | | Merge commit '1c548179778befb50ee7481be7ffc91f2d53fede' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-10-07 | 1 | -1/+1 | |
| | |\ \ | | |/ | ||||||
| * | | | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+17 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add note to docs | BlueWall | 2011-10-07 | 1 | -0/+17 | |
| | | | | | | | | | | | | | | | | This method is used by externasl/3rd party management tools to create users and they depend on us to generate the UUID. | |||||
| * | | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log message | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 | |
| | |/ | | | | | | | As per earlier discussions with dslake | |||||
| * | | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmerge | Melanie | 2011-10-12 | 3 | -51/+51 | |
| |\ \ | |/ | ||||||
| | * | Fixed line endings from previous commit | Dan Lake | 2011-10-06 | 3 | -51/+51 | |
| | | | ||||||
| * | | Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmerge | Melanie | 2011-10-12 | 0 | -0/+0 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 3 | -13/+6 | |
| | |\ | ||||||
| * | \ | Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge | Melanie | 2011-10-12 | 5 | -89/+79 | |
| |\ \ \ | |/ / | ||||||
| | * | | Refactored "known child region" in ScenePresence. There were 4 different | Dan Lake | 2011-10-06 | 5 | -89/+79 | |
| | | | | | | | | | | | | | | | | | | | ways to access the list/dictionary of child regions and locking was inconsistent. There are now public properties which enforce locks. Callers are no longer required to create new copies of lists. | |||||
| * | | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmerge | Melanie | 2011-10-12 | 3 | -13/+6 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | remove the pointless slashes on the end of the (5!) different server stat ↵ | Justin Clark-Casey (justincc) | 2011-10-07 | 3 | -13/+6 | |
| | |/ | | | | | | | | | | | | | retrieval mechanisms. Original request URLs that end with / will still work, but this will allow one to type /simstatus as well as /simstatus/ Can't do this with webstats yet since it does insane things to the path. | |||||
| * | | Merge commit '4c812884be59d76039afee74725fc45981356f36' 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-06 | 3 | -301/+312 | |
| | |\ | ||||||
| * | \ | Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+3 | |
| |\ \ \ | |/ / | ||||||
| | * | | WebStats - Home Link Fix | Pixel Tomsen | 2011-10-06 | 1 | -2/+3 | |
| | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=4536 | |||||
| * | | | 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 | |
| |\ \ \ | | |/ | |/| | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |