Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | 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 | |
* | | | | | | | 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 ret... | Justin Clark-Casey (justincc) | 2011-10-07 | 3 | -13/+6 | |
| |/ / / / / | ||||||
* | | | | | | 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 | |
* | | | | | | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmerge | Melanie | 2011-10-12 | 2 | -17/+16 | |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | ||||||
| * | | | | | | Simplified IsInTransit property on ScenePresence and removed InTransit() whic... | Dan Lake | 2011-10-06 | 2 | -17/+16 | |
* | | | | | | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmerge | Melanie | 2011-10-12 | 1 | -3/+0 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-06 | 8 | -109/+87 | |
| |\ \ \ \ \ \ | ||||||
* | | | | | | | | 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 int... | Melanie | 2011-10-12 | 0 | -0/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix tree populator | Melanie | 2011-10-12 | 1 | -10/+0 | |
* | | | | | | | | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmerge | Melanie | 2011-10-12 | 2 | -265/+266 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / / | ||||||
| * | | | | | | | Refactor ScenePresence so gets and sets are through properties. Added private... | Dan Lake | 2011-10-06 | 1 | -287/+288 | |
* | | | | | | | | 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 | |
| | |/ / / / / | |/| | | | | | ||||||
* | | | | | | | 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 i... | Justin Clark-Casey (justincc) | 2011-10-06 | 4 | -36/+21 | |
* | | | | | | | 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 a... | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -11/+11 | |
* | | | | | | | 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 with... | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -1/+1 | |
* | | | | | | | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmerge | Melanie | 2011-10-12 | 1 | -34/+7 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Change WebStatsModule to check its config properly, instead of catching the i... | Justin Clark-Casey (justincc) | 2011-10-05 | 1 | -34/+7 | |
* | | | | | | | 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 | |
| |/ / / / / | ||||||
* | | | | | | 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 | |
|\ \ \ \ \ \ \ | |/ / / / / / | ||||||
| * | | | | | | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ob... | Dan Lake | 2011-10-04 | 1 | -14/+2 | |
* | | | | | | | 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 UU... | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -8/+28 | |
* | | | | | | | | 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 | |
| | |/ / / / / | |/| | | | | |