| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 '156385f48b2b2829f2d427c72f269406c46019fa' into bigmerge | Melanie | 2011-10-12 | 1 | -2/+4 |
|\ \
| |/ |
|
| * | Tweak to language of last commit in rejecting UUID.Zero in GridService.Regist... | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -2/+4 |
* | | Merge commit 'a6c5e00c45b3d64b4e912a65c8ed7f31eb643759' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | GridService - Region UUID can not be NULL | Pixel Tomsen | 2011-10-08 | 1 | -0/+2 |
* | | Merge commit '29660fe175ef3b49ff649a26bd9bcf4c9eb7c6dd' into bigmerge | Melanie | 2011-10-12 | 1 | -39/+1 |
|\ \
| |/ |
|
| * | Remove the inconsistently applied now pointless FailIfRemoteAdminDisabled() c... | Justin Clark-Casey (justincc) | 2011-10-08 | 1 | -39/+1 |
* | | Merge commit '71d29decc87952790b3f5264ad4a29da171b1689' into bigmerge | Melanie | 2011-10-12 | 2 | -5/+6 |
|\ \
| |/ |
|
| * | replace List used by m_accessIP in RemoteAdminPlugin with the more efficient ... | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -5/+5 |
* | | Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge | Melanie | 2011-10-12 | 2 | -0/+2 |
|\ \
| |/ |
|
| * | Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there... | Justin Clark-Casey (justincc) | 2011-10-08 | 2 | -0/+2 |
* | | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge | Melanie | 2011-10-12 | 3 | -124/+124 |
|\ \
| |/ |
|
| * | Add option to allow only explicitly listed IPs to access RemoteAdmin facilities. | Justin Clark-Casey (justincc) | 2011-10-08 | 3 | -124/+124 |
* | | 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 |
* | | Adjust CM version tag | Melanie | 2011-10-12 | 1 | -1/+1 |
* | | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | flip master version up to 0.7.3 | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
* | | Merge commit 'b5e6209cfd1c0b655852cf40e99f50aa2db9d8fa' 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-07 | 1 | -0/+17 |
| |\ |
|
* | \ | Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \
| |/ / |
|
| * | | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenS... | Justin Clark-Casey (justincc) | 2011-10-07 | 1 | -1/+1 |
* | | | 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 |
* | | | 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 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 |
* | | | 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 |