| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Port the mel/dahlia fix | Melanie | 2012-05-15 | 2 | -1/+11 | |
| | | | | | ||||||
| | * | | | don't send colision events to volume detectors | UbitUmarov | 2012-05-15 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Merge branch 'ubitwork' into avination | Melanie | 2012-05-15 | 1 | -4/+14 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-05-15 | 6 | -525/+195 | |
| | | |\ \ \ | ||||||
| | | * | | | | make llGetCameraPos and llGetCameraRot apply to avatar that granted ↵ | UbitUmarov | 2012-05-14 | 1 | -4/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | permission and not owner | |||||
| | * | | | | | Fix an omission | Melanie | 2012-05-15 | 1 | -1/+1 | |
| | | |/ / / | |/| | | | ||||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-15 | 1 | -1/+4 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-05-15 | 0 | -0/+0 | |
| | |\ \ \ \ | ||||||
| | | * | | | | Add another null check to Melanie's last commit. Seems to eliminate sqlite ↵ | dahlia | 2012-05-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | errors in log but no idea if it's working properly | |||||
| | * | | | | | Guard against null root part on SQLite. This really needs to be fixed so SQLite | Melanie | 2012-05-15 | 1 | -1/+1 | |
| | |/ / / / | | | | | | | | | | | | | | | | loads roots before children like MySQL does. | |||||
| | * | | | | Try to fix sqlite breakage | Melanie | 2012-05-15 | 1 | -0/+3 | |
| | | | | | | ||||||
| | * | | | | Port Avination's collision fixes to core. | Melanie | 2012-05-15 | 5 | -523/+199 | |
| | | |_|/ | |/| | | ||||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-14 | 6 | -525/+195 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Completely revamp collision handling. Now works as it is supposed to. | Melanie | 2012-05-14 | 5 | -523/+189 | |
| | | | | | ||||||
| | * | | | Check parcel entry permissions when moving objects | Melanie | 2012-05-14 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Allow non-gods to deed no-mod objects | Melanie | 2012-05-14 | 1 | -1/+4 | |
| | | |/ | |/| | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-05-14 | 14 | -90/+344 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | Save the Telehub and its Spawn Points in the OAR | Oren Hurvitz | 2012-05-14 | 6 | -5/+100 | |
| | | | | ||||||
| | * | | set executable bit for Ionic.Zip.dll for running OpenSimulator under cygwin | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -0/+0 | |
| | | | | ||||||
| | * | | minor: add explanative comment to 'missing baked texture' logging commonly ↵ | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -0/+10 | |
| | | | | | | | | | | | | | seen on inter-simulator teleports where avatar baked textures are not available from the asset service. | |||||
| | * | | minor: comment out individual attachment transfer log messages for now | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -4/+4 | |
| | | | | ||||||
| | * | | Set the agent in transit teleport flag at the first available opportunity ↵ | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -11/+37 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (i.e. when IsInTransit() was being checked) to close down a race condition. On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts. However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check. This has been seen in the field and the results aren't pretty. This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window. More failure cases are made to to call ResetInTransit() to adjust to this move. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-05-14 | 5 | -67/+188 | |
| | |\ \ | ||||||
| | | * | | Oops - missed the config changes | BlueWall | 2012-05-14 | 1 | -0/+8 | |
| | | | | | ||||||
| | | * | | Merge branch 'master' of /home/opensim/src/OpenSim | BlueWall | 2012-05-13 | 3 | -29/+34 | |
| | | |\ \ | ||||||
| | | | * | | Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out ↵ | Chris Koeritz | 2012-05-13 | 3 | -29/+34 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing. Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-05-13 | 1 | -1/+1 | |
| | | |\ \ \ | | | |/ / | | |/| | | ||||||
| | | * | | | Add configurable SpawnPointRouting | BlueWall | 2012-05-13 | 2 | -38/+146 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Will use one of three selected methods to route avatar landing points when using Telehubs. The setting is in [Startup] using SpawnPointRouting = closest/random/sequence closest: The default setting. Routes avatar to the nearest SpawnPoint to the location. random: Picks random SpawnPoints to land the avatar. sequence: Follows a sequence to place the avatar on the next available SpawnPoint location Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | | | Add more region information to some teleport related logging | Justin Clark-Casey (justincc) | 2012-05-14 | 1 | -7/+8 | |
| | | |/ / | |/| | | ||||||
| * | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 11 | -29/+129 | |
| |\ \ \ \ | | |_|/ | |/| | | ||||||
| | * | | | ubitODE fix force in case of mlinear motor offset present | UbitUmarov | 2012-05-13 | 1 | -4/+5 | |
| | | | | | ||||||
| | * | | | display a sleep time of zero if forced spare time to zero, when sim fps is ↵ | UbitUmarov | 2012-05-12 | 1 | -2/+7 | |
| | | | | | | | | | | | | | | | | | lower than desired, for better display coerence. | |||||
| | * | | | ªTEST MESS* reduce animation packets send. Added onchangeanim event with ↵ | UbitUmarov | 2012-05-12 | 7 | -3/+53 | |
| | | | | | | | | | | | | | | | | | parameters to define if to add or remove, and if to send anims pack on that evocation, etc | |||||
| | * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-05-12 | 4 | -0/+96 | |
| | |\ \ \ | ||||||
| | * | | | | ubitODE let vehicles responde faster to changes of some parameters like ↵ | UbitUmarov | 2012-05-12 | 1 | -12/+13 | |
| | | | | | | | | | | | | | | | | | | | | | motors decay times | |||||
| | * | | | | ubitODE reduced again a bit the max allowed correction velocity on ↵ | UbitUmarov | 2012-05-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | colisions, to reduce a bit bouncing inerent to colisions. | |||||
| | * | | | | ubitODE: trial workaround for avatar colisions | UbitUmarov | 2012-05-12 | 1 | -6/+49 | |
| | | | | | | ||||||
| | * | | | | revert terminal vel reduction. It helped but not efective | UbitUmarov | 2012-05-11 | 1 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'avination' into careminster | Melanie | 2012-05-13 | 3 | -106/+163 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | Mantis 6015 new LSL function llGetAgentList. | Talun | 2012-05-11 | 4 | -0/+96 | |
| | |/ / / | | | | | | | | | | | | | Details in the lsl wiki | |||||
| | * | | | reduce avatars terminal velocity to less than 30m/s or colisions with basic ↵ | UbitUmarov | 2012-05-10 | 2 | -6/+9 | |
| | | | | | | | | | | | | | | | | | boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt). | |||||
| | * | | | ubitode: changes to vehicles servos | UbitUmarov | 2012-05-10 | 1 | -100/+154 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-05-13 | 9 | -32/+444 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | Fix mono compiler warning. | Justin Clark-Casey (justincc) | 2012-05-12 | 1 | -1/+1 | |
| | | |/ | |/| | | | | | | | Last jenkins failure looked like a glitch. | |||||
| | * | | Revert "Save the Telehub and its Spawn Points in the OAR" | Justin Clark-Casey (justincc) | 2012-05-12 | 6 | -100/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b0b7b45b943dd94546bcfcf5d3bb871cfe35b507. Sorry BlueWall, I wanted to discuss an aspect of the data storage but I couldn't assign bugs in 'patch included' state to myself until I changed mantis just now and I forgot to mention it on irc. I wouldn't normally revert but thinks get tricky when it comes to data formats. Essentially, I would like to see the Yaw, Pitch and Distance values as separate XML entities (as used in other aspects such as vectors, quaternions) rather than as a . delimited string We can discuss this more with Oren in opensimulator.org/mantis/view.php?id=6008 | |||||
| | * | | Save the Telehub and its Spawn Points in the OAR | Oren Hurvitz | 2012-05-10 | 6 | -5/+100 | |
| | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | | Print out more information on connecting bots | Justin Clark-Casey (justincc) | 2012-05-11 | 2 | -9/+19 | |
| | | | | ||||||
| | * | | Increase minimum period between bot actions to 3 seconds, so that teleport ↵ | Justin Clark-Casey (justincc) | 2012-05-11 | 1 | -2/+2 | |
| | | | | | | | | | | | | | doesn't fall under the minimum 2 second limits that clients take to process it | |||||
| | * | | Stagger multiple bot logins by 5 seconds to make this part of the test more ↵ | Justin Clark-Casey (justincc) | 2012-05-11 | 1 | -0/+13 | |
| | | | | | | | | | | | | | | | | | | | 'realistic' TODO: Need to make this value configurable by a command line parameter to pCampbot | |||||
| | * | | Do bot startup on another thread so console is responsive during this process | Justin Clark-Casey (justincc) | 2012-05-11 | 2 | -1/+5 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |