aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* 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 commit '38d205502a83ed334d9827f43862579cec305639' into bigmergeMelanie2011-10-120-0/+0
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-046-18/+37
| |\
* | \ 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 '9a49b3b5197f41353c32443dbc5432a4bcd58958' into bigmergeMelanie2011-10-120-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-041-1/+1
| |\ \
* | \ \ Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-124-8/+28
|\ \ \ \ | |/ / /
| * | | When creating a new user on the comand line, give the option of allowing a UU...Justin Clark-Casey (justincc)2011-10-044-8/+28
* | | | Merge commit '413e299045112d4a1553929eb042e87587cb3d2e' into bigmergeMelanie2011-10-120-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-10-046-393/+393
| |\ \ \ | | |/ /
* | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ \ | |/ / /
| * | | Turn off keepalives when commands are specifiedMic Bowman2011-10-041-1/+1
* | | | Merge commit '8a216dc1ccdc336a22958cd476de034d065cf676' into bigmergeMelanie2011-10-120-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-044-384/+385
| |\ \ \ | | | |/ | | |/|
* | | | Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmergeMelanie2011-10-122-9/+8
|\ \ \ \ | |/ / /
| * | | Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].Justin Clark-Casey (justincc)2011-10-042-9/+8
| | |/ | |/|
* | | 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-12105-10275/+2555
|\ \ \
| * \ \ 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 commit 'bfa405e6f70ee31510a20f708327c1c254398926' into bigmergeMelanie2011-10-110-0/+0
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-035-68/+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
| |\ \ \ | | |/ /
| | * | Animation-States Turning Left, Turning Right implemented/enabledPixel Tomsen2011-10-041-2/+6
| * | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmergeMelanie2011-10-111-1/+1
| |\ \ \ | | |/ /
| | * | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather...Justin Clark-Casey (justincc)2011-10-041-1/+1
| * | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmergeMelanie2011-10-111-1/+16
| |\ \ \ | | |/ /
| | * | For llGetTexture(), if the face texture asset is in the inventory, return the...Justin Clark-Casey (justincc)2011-10-041-1/+16
| * | | Merge commit '34026887feb7ec769d1f9551bcd1ccd9b3b9ea7c' into bigmergeMelanie2011-10-110-0/+0
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-035-12/+11
| | |\ \ | | | |/
| * | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-113-58/+51
| |\ \ \ | | |/ /
| | * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-033-63/+49
generated by cgit v1.1 at 2024-12-19 06:36:37 +0000