| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 8 | -55/+76 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Comment out some debug ATTACHMENTS log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -15/+14 |
| * | | | | Comment out the noisier AVFACTORY log messages for now. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -4/+6 |
| * | | | | Improve teleport log debug and error messages to tell us who is teleporting. | Justin Clark-Casey (justincc) | 2012-04-25 | 1 | -3/+14 |
| * | | | | Go back to always using the local timezone for now - not all machines have US... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -13/+18 |
| * | | | | Revert "Refactored how asset/inventory types are associated with content type... | Justin Clark-Casey (justincc) | 2012-04-24 | 2 | -177/+228 |
| * | | | | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 6 | -12/+24 |
| * | | | | Refactored how asset/inventory types are associated with content types: gathe... | Oren Hurvitz | 2012-04-24 | 2 | -228/+177 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-24 | 15 | -355/+298 |
|\ \ \ \ \
| |/ / / / |
|
| * | | | | Fixed problem with MySQL: it was possible for one thread to use an incomplete... | Oren Hurvitz | 2012-04-24 | 3 | -21/+37 |
| * | | | | When reading a region, use null objects to represent NULL fields. | Oren Hurvitz | 2012-04-24 | 1 | -1/+5 |
| * | | | | OSSL: fixed the threat level check for osParseJSONNew | Oren Hurvitz | 2012-04-24 | 1 | -1/+1 |
| * | | | | minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chief... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -1/+6 |
| * | | | | DST settings to match client default Pacific Time (mantis #5972) | Olivier van Helden and Gudule Lapointe (Speculoos.net) | 2012-04-24 | 1 | -1/+15 |
| * | | | | Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ... | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -0/+1 |
| * | | | | Changed the Map-related messages from Info to Debug. They're debug messages. | Diva Canto | 2012-04-23 | 4 | -8/+8 |
| * | | | | Add online/offline indicator to "friends show" region console command. | Justin Clark-Casey (justincc) | 2012-04-24 | 1 | -3/+14 |
| * | | | | Add osForceAttachToAvatar() and osForceDetachFromAvatar() | Justin Clark-Casey (justincc) | 2012-04-24 | 6 | -49/+127 |
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-23 | 6 | -58/+120 |
| |\ \ \ \
| | | |_|/
| | |/| | |
|
| * | | | | Replace common code to fetch self inventory item (as opposed to uuid) with Ge... | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -155/+76 |
| * | | | | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api | Justin Clark-Casey (justincc) | 2012-04-23 | 1 | -94/+42 |
* | | | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... | Melanie | 2012-04-23 | 7 | -502/+617 |
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| * | | | | ubitODE - do own timing control (as chODE does) until heartbeat does it right | UbitUmarov | 2012-04-23 | 2 | -21/+34 |
| * | | | | ubitODE - several changes... | UbitUmarov | 2012-04-23 | 3 | -431/+379 |
| * | | | | fix a bug i added fixing another.... | UbitUmarov | 2012-04-22 | 1 | -2/+5 |
| * | | | | ubitODE: - don't try to hover underground unless volumedetector (that doesn't... | UbitUmarov | 2012-04-21 | 1 | -47/+93 |
| * | | | | changed seletion code. SOP now knows about parts selection. UI actions are se... | UbitUmarov | 2012-04-20 | 3 | -24/+104 |
| * | | | | ubitODE: - Change triangles used in terrain height estimation | UbitUmarov | 2012-04-20 | 1 | -11/+28 |
| * | | | | ubitODE - again avatar/terrain collision. Reduce new viewers interpolators ef... | UbitUmarov | 2012-04-20 | 1 | -6/+14 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-23 | 14 | -124/+473 |
|\ \ \ \ \
| | |_|/ /
| |/| | | |
|
| * | | | | Mantis 5977 Corrections to llRegionSayTo | Talun | 2012-04-23 | 6 | -58/+120 |
| | |/ /
| |/| | |
|
| * | | | refactor: simply some properties code in BasicPhysicsPlugin | Justin Clark-Casey (justincc) | 2012-04-22 | 2 | -72/+12 |
| * | | | Make TestSetPhysicsSinglePrim() actually add the object to the scene in order... | Justin Clark-Casey (justincc) | 2012-04-22 | 1 | -0/+2 |
| * | | | Fix bug where setting phantom on a prim would result in a server log message ... | Justin Clark-Casey (justincc) | 2012-04-22 | 6 | -32/+382 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-22 | 6 | -248/+352 |
|\ \ \ \
| |/ / / |
|
| * | | | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa... | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -10/+20 |
| * | | | refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -115/+117 |
| * | | | Add test for setting physics in a linkset | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+28 |
| * | | | Add regression test for prim status when root prim in a new linkset is non-ph... | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -1/+20 |
| * | | | Fix a bug where linking a non-physical prim with a physical prim as root woul... | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -0/+22 |
| * | | | Add test for correct physics status on linking two physics objects | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -2/+26 |
| * | | | refactor: extract common setup code in SceneObjectStatusTests | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -10/+16 |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-04-21 | 2 | -120/+95 |
| |\ \ \ |
|
| | * | | | Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim. | Justin Clark-Casey (justincc) | 2012-04-21 | 1 | -116/+88 |
| * | | | | Add TestSetPhysics() to SOP status tests | Justin Clark-Casey (justincc) | 2012-04-21 | 3 | -4/+27 |
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 0 | -0/+0 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Improve bitmap disposal to do null checks and not to potentially try disposal... | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -4/+7 |
| |/ / / |
|
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 1 | -12/+10 |
|\ \ \ \
| |/ / / |
|
| * | | | If a physical prim is manually moved (e.g. by a user) then set the geometry p... | Justin Clark-Casey (justincc) | 2012-04-20 | 1 | -12/+10 |
* | | | | Merge branch 'master' into careminster | Melanie | 2012-04-20 | 5 | -53/+106 |
|\ \ \ \
| |/ / / |
|