aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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 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 branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-062-301/+301
| |\
* | \ 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-067-109/+76
| |\ \ | | |/
* | | HACK: Remove advanced property resending until it is fixed properly in core.Melanie2011-10-121-10/+14
* | | 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 '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
|\ \ \ | |/ /
| * | Remove unused local variable i from OdeScene.Simulate()Justin Clark-Casey (justincc)2011-10-051-3/+0
* | | Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmergeMelanie2011-10-123-24/+36
|\ \ \ | |/ /
| * | Make reported sim fps more accurate, in line with frame time msJustin Clark-Casey (justincc)2011-10-053-24/+36
| |/
* | Merge commit '3142982353a121920e571e5b33acffc065b20a2e' into bigmergeMelanie2011-10-121-21/+4
|\ \ | |/
| * Removed redundant scene presence lookups in HGMessageTransferModuleDan Lake2011-10-051-21/+4
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-041-1/+10
| |\
* | \ Merge commit '146322eb34c15a5722cfe42dd012821ddf441fe6' into bigmergeMelanie2011-10-121-7/+5
|\ \ \ | |/ /
| * | Removed redundant IClientAPI calls from TreePopulatorModule. Removing tree ob...Dan Lake2011-10-041-14/+2
* | | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-1/+10
|\ \ \ | | |/ | |/|
| * | When creating a new user on the comand line, give the option of allowing a UU...Justin Clark-Casey (justincc)2011-10-041-1/+10
| |/
* | Fix rezzing coalesced object broken by core mergeMelanie2011-10-121-54/+36
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-1260-9679/+1476
|\ \
| * \ Merge commit '92c88121c72386f85472c6cf4891eca8b62b9867' into bigmergeMelanie2011-10-124-427/+409
| |\ \ | | |/
| | * Removed all refs to IClientAPI from IAttachmentsModule. Separated client hand...Dan Lake2011-10-044-384/+385
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-034-65/+73
| | |\
| * | \ Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmergeMelanie2011-10-116-135/+86
| |\ \ \ | | |/ /
| | * | Removed redundant code in AttachmentsModule and simplified interfaces which c...Dan Lake2011-10-036-131/+83
| * | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmergeMelanie2011-10-111-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | trival tweak to trigger the continuous integration systemJustin Clark-Casey (justincc)2011-10-041-1/+1
| * | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmergeMelanie2011-10-111-3/+13
| |\ \ \ | | |/ /
generated by cgit v1.1 at 2024-11-13 13:52:52 +0000