| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '77b8fb0f86cd0342fa7331f04f56c0b5980290c2' into bigmerge | Melanie | 2011-10-12 | 1 | -0/+11 |
|\ |
|
| * | Added back UserAccount that creates random UUID for new account. | BlueWall | 2011-10-05 | 1 | -0/+11 |
* | | 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 | 4 | -9/+29 |
| |\ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| | |\ |
|
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-10-04 | 4 | -384/+385 |
| | | |\ |
|
* | | | \ | 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 | 4 | -8/+28 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | When creating a new user on the comand line, give the option of allowing a UU... | Justin Clark-Casey (justincc) | 2011-10-04 | 4 | -8/+28 |
| |/ / |
|
* | | | Merge commit 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmerge | Melanie | 2011-10-12 | 1 | -1/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Turn off keepalives when commands are specified | Mic Bowman | 2011-10-04 | 1 | -1/+1 |
* | | | 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 | 88 | -10078/+2211 |
|\ \ \ |
|
| * \ \ | 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 |
| | |/ |
|
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Dan Lake | 2011-10-03 | 5 | -68/+73 |
| | |\ |
|
| * | \ | Merge commit '460946ad62b682c7a942751f192ca9e96b662f0e' into bigmerge | Melanie | 2011-10-11 | 6 | -135/+86 |
| |\ \ \
| | |/ / |
|
| | * | | Removed redundant code in AttachmentsModule and simplified interfaces which c... | Dan Lake | 2011-10-03 | 6 | -131/+83 |
| * | | | Merge commit 'c7d0d71666a92b201d639511d062a7c22726b3c9' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | trival tweak to trigger the continuous integration system | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| * | | | Merge commit 'b98442dceccd416a493f19153f5daad2e173183e' into bigmerge | Melanie | 2011-10-11 | 1 | -3/+13 |
| |\ \ \
| | |/ / |
|
| | * | | Animation-States Turning Left, Turning Right implemented/enabled | Pixel Tomsen | 2011-10-04 | 1 | -2/+6 |
| * | | | Merge commit 'a8af0a5ba873dbb8c447e16b142ba7f5af715bdb' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+1 |
| |\ \ \
| | |/ / |
|
| | * | | Return NULL_KEY from llGetTexture if a non-existent face is indicated, rather... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+1 |
| * | | | Merge commit '8a6e6866d9c6c60e4a2e4b980ca2e35ae3963d0d' into bigmerge | Melanie | 2011-10-11 | 1 | -1/+16 |
| |\ \ \
| | |/ / |
|
| | * | | For llGetTexture(), if the face texture asset is in the inventory, return the... | Justin Clark-Casey (justincc) | 2011-10-04 | 1 | -1/+16 |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2011-10-03 | 4 | -12/+11 |
| | |\ \
| | | |/ |
|
| * | | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmerge | Melanie | 2011-10-11 | 3 | -58/+51 |
| |\ \ \
| | |/ / |
|
| | * | | Remove vestigal RegionStatus.SlaveScene. | Justin Clark-Casey (justincc) | 2011-10-03 | 3 | -63/+49 |
| * | | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmerge | Melanie | 2011-10-11 | 4 | -11/+10 |
| |\ \ \
| | | |/
| | |/| |
|
| | * | | Remove usage of Linden packet types from inside Attachments Module and interface | Dan Lake | 2011-10-03 | 4 | -12/+11 |
| | |/ |
|
| * | | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmerge | Melanie | 2011-10-11 | 4 | -17/+1 |
| |\ \
| | |/ |
|
| | * | Remove unimplementated UpdateMovement() methods from SOG, SOP. | Justin Clark-Casey (justincc) | 2011-10-01 | 4 | -17/+1 |
| * | | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmerge | Melanie | 2011-10-11 | 7 | -1640/+0 |
| |\ \
| | |/ |
|
| | * | Remove OpenSim.Region.Examples.SimpleModule | Justin Clark-Casey (justincc) | 2011-10-01 | 7 | -1634/+0 |
| * | | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmerge | Melanie | 2011-10-11 | 1 | -0/+41 |
| |\ \
| | |/ |
|