| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge | Melanie | 2011-10-12 | 1 | -15/+35 |
|\ |
|
| * | Provide a way to turn the MonitorModule on and off | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -15/+35 |
* | | Merge commit '2b290793ab7153c956db5637dd27dfbbd0a1cf98' into bigmerge | Melanie | 2011-10-12 | 3 | -15/+2 |
|\ \
| |/ |
|
| * | refactor: have lsl and ossl interrogate scene.StatsReporter directly rather t... | Justin Clark-Casey (justincc) | 2011-10-10 | 3 | -15/+2 |
* | | Merge commit '013bf2775fc02d12ef39f6ca49ff8ecd53028e9c' into bigmerge | Melanie | 2011-10-12 | 1 | -6/+4 |
|\ \
| |/ |
|
| * | remove unused LastAssetID from DynamicTextureUpdaer | Justin Clark-Casey (justincc) | 2011-10-10 | 1 | -6/+4 |
* | | Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+6 |
|\ \
| |/ |
|
| * | Go back to lying that sim fps is 55 when it's actually locked at a maximum of... | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+6 |
* | | 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 |
* | | 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 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 branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-06 | 2 | -301/+301 |
| |\ |
|
* | \ | 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 | 7 | -109/+76 |
| |\ \
| | |/ |
|
* | | | HACK: Remove advanced property resending until it is fixed properly in core. | Melanie | 2011-10-12 | 1 | -10/+14 |
* | | | 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 '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 branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-04 | 1 | -1/+10 |
| |\ |
|
* | \ | 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 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+10 |
|\ \ \
| | |/
| |/| |
|
| * | | When creating a new user on the comand line, give the option of allowing a UU... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+10 |
| |/ |
|
* | | 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 | 60 | -9679/+1476 |
|\ \ |
|
| * \ | Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmerge | Melanie | 2011-10-12 | 4 | -427/+409 |
| |\ \
| | |/ |
|
| | * | Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand... | Dan Lake | 2011-10-04 | 4 | -384/+385 |