aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there...Justin Clark-Casey (justincc)2011-10-082-0/+2
* | Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmergeMelanie2011-10-123-124/+124
|\ \ | |/
| * Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.Justin Clark-Casey (justincc)2011-10-083-124/+124
* | Merge commit 'ff80113534182bbcbcb49a73035776134fb04e3e' into bigmergeMelanie2011-10-121-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-081-2/+6
* | Adjust CM version tagMelanie2011-10-121-1/+1
* | Merge commit 'f8c06c61149b1ab3e3002247280be250b558a79e' into bigmergeMelanie2011-10-121-1/+1
|\ \ | |/
| * flip master version up to 0.7.3Justin Clark-Casey (justincc)2011-10-071-1/+1
* | Merge commit 'b5e6209cfd1c0b655852cf40e99f50aa2db9d8fa' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-071-0/+17
| |\
* | \ Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenS...Justin Clark-Casey (justincc)2011-10-071-1/+1
* | | Merge commit '1c548179778befb50ee7481be7ffc91f2d53fede' into bigmergeMelanie2011-10-120-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2011-10-071-1/+1
| |\ \ | | |/
* | | Merge commit 'a9b3ab0c85b567552f31490126a1ff5479352413' into bigmergeMelanie2011-10-121-0/+17
|\ \ \ | |/ /
| * | Add note to docsBlueWall2011-10-071-0/+17
* | | Merge commit 'e3c522e2118108a01d2c6f77c8065224d53d6bb9' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Comment out [SCENE PRESENCE] SendAppearanceToAllOtherAgents: log messageJustin Clark-Casey (justincc)2011-10-071-1/+1
| |/
* | Merge commit '4b46b7a5adb1c7449725ed1cf1fa5d7122af10bb' into bigmergeMelanie2011-10-123-51/+51
|\ \ | |/
| * Fixed line endings from previous commitDan Lake2011-10-063-51/+51
* | Merge commit 'f26a966b8e79688ca2ed81c236492d694f34ac7d' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-063-13/+6
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-125-89/+79
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-065-89/+79
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-123-13/+6
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-073-13/+6
| |/
* | Merge commit '4c812884be59d76039afee74725fc45981356f36' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-063-301/+312
| |\
* | \ Merge commit '95910f03d454e678a04ae7e800a445ba609b6003' into bigmergeMelanie2011-10-121-2/+3
|\ \ \ | |/ /
| * | WebStats - Home Link FixPixel Tomsen2011-10-061-2/+3
* | | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-122-17/+16
|\ \ \ | | |/ | |/|
| * | Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-062-17/+16
* | | Merge commit '08f264d096e1dca535a64e683fa5ab5918368085' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-068-109/+87
| |\ \
* | | | HACK: Remove advanced property resending until it is fixed properly in core.Melanie2011-10-121-10/+14
* | | | Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster int...Melanie2011-10-120-0/+0
|\ \ \ \
| * | | | Fix tree populatorMelanie2011-10-121-10/+0
* | | | | Merge commit 'bd9ba904c3e4d9c2c626a7749f19f124b4ddcf15' into bigmergeMelanie2011-10-122-265/+266
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Refactor ScenePresence so gets and sets are through properties. Added private...Dan Lake2011-10-061-287/+288
* | | | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmergeMelanie2011-10-121-0/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Added back UserAccount that creates random UUID for new account.BlueWall2011-10-051-0/+11
| | |/ | |/|
* | | Merge commit 'ca83f99332316fda1c412a5bf2889f9cf5cf3577' into bigmergeMelanie2011-10-124-36/+21
|\ \ \ | |/ /
| * | Instead of adding stat agentMS in all kinds of places, calculate it instead i...Justin Clark-Casey (justincc)2011-10-064-36/+21
* | | Merge commit '7fa1c979cf60a981200c4ddc3ea0ff8d0ddb2aa7' into bigmergeMelanie2011-10-121-11/+11
|\ \ \ | |/ /
| * | rename WebStatsModules.m_scene to m_scenes since it's a list of scenes, not a...Justin Clark-Casey (justincc)2011-10-051-11/+11
* | | Merge commit '8a8983b3d40ba4e38569f4456c6a98d9372c3822' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Add user ID to new estate user prompt, to make it clearer and consistent with...Justin Clark-Casey (justincc)2011-10-051-1/+1
* | | Merge commit '604708fc969b92af4f07d4acae9f3d15c7cee63e' into bigmergeMelanie2011-10-121-34/+7
|\ \ \ | |/ /
| * | Change WebStatsModule to check its config properly, instead of catching the i...Justin Clark-Casey (justincc)2011-10-051-34/+7
* | | Merge commit '9090039324ecc45bf1005e719f61a80f0187cb73' into bigmergeMelanie2011-10-121-3/+0
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-12-23 01:46:43 +0000