aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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-044-9/+29
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-041-1/+1
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-10-044-384/+385
| | | |\
* | | | \ 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-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 'b229a72a5fb929d4886117f39ed6bd17a6d56aef' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | Turn off keepalives when commands are specifiedMic Bowman2011-10-041-1/+1
* | | 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-1288-10078/+2211
|\ \ \
| * \ \ 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-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 branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-034-12/+11
| | |\ \ | | | |/
| * | | Merge commit '37ae6451f9ddb2e07402a5e79a9ab58668781104' into bigmergeMelanie2011-10-113-58/+51
| |\ \ \ | | |/ /
| | * | Remove vestigal RegionStatus.SlaveScene.Justin Clark-Casey (justincc)2011-10-033-63/+49
| * | | Merge commit 'e77c919290e166f19e77f3ef040418dd39f2f5bd' into bigmergeMelanie2011-10-114-11/+10
| |\ \ \ | | | |/ | | |/|
| | * | Remove usage of Linden packet types from inside Attachments Module and interfaceDan Lake2011-10-034-12/+11
| | |/
| * | Merge commit '56dbab35e122e724c9277b05820417a05ad8a1be' into bigmergeMelanie2011-10-114-17/+1
| |\ \ | | |/
| | * Remove unimplementated UpdateMovement() methods from SOG, SOP.Justin Clark-Casey (justincc)2011-10-014-17/+1
| * | Merge commit '42fe774ad10d469c11fe58731fcab0e4df760871' into bigmergeMelanie2011-10-117-1640/+0
| |\ \ | | |/
| | * Remove OpenSim.Region.Examples.SimpleModuleJustin Clark-Casey (justincc)2011-10-017-1634/+0
| * | Merge commit 'c7db3df3442657cda398ff2f90d387bce98c718a' into bigmergeMelanie2011-10-111-0/+41
| |\ \ | | |/
| | * llGetLinkKey, llGetLinkName Fix for sitting AvatarPixel Tomsen2011-10-011-0/+41
| * | Merge commit 'a1875ec7600758087f6c06ccaf625507362e215c' into bigmergeMelanie2011-10-111-1/+8
| |\ \ | | |/
| | * Add ability to pass in the permissions option (perm) to save oar via RemoteAdminJustin Clark-Casey (justincc)2011-10-011-1/+8
| * | Merge commit '246443773ae52420092b483603d0e1daf9b87f00' into bigmergeMelanie2011-10-112-8/+14
| |\ \ | | |/
| | * minor: remove clutter null check from pass in config to AvatarFactoryModule.I...Justin Clark-Casey (justincc)2011-10-012-8/+14
| * | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-113-6/+55
| |\ \ | | |/
generated by cgit v1.1 at 2024-11-15 05:32:22 +0000