aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-04-2633-383/+506
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-252-7/+47
| |\
| | * Port Avination link order to make OpenSim behave like SL. Make Primstar scrip...Melanie2012-04-252-7/+47
| * | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-253-1/+10
| |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-04-2550-801/+1393
| |\
| | * Slight rewording of output messages.Diva Canto2012-04-241-1/+1
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-242-1/+13
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-04-251-0/+1
| | | |\
| | | | * zero out SP velocity before calling SP.Teleport(), as the client expects (tho...Justin Clark-Casey (justincc)2012-04-251-0/+1
| | | * | Commit the avination Teleport() methods (adaptedto justincc's changes)Melanie2012-04-251-1/+12
| | | |/
| | * | HG: Moved User-level code down to the HGEntityTransferModule where it belongs.Diva Canto2012-04-242-14/+14
| | |/
| | * refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()Justin Clark-Casey (justincc)2012-04-252-17/+1
| | * Add regression test TestSameRegionTeleport()Justin Clark-Casey (justincc)2012-04-253-1/+43
| | * Comment out AvatarService.SetAvatar debug log line for nowJustin Clark-Casey (justincc)2012-04-251-1/+1
| | * Comment out some debug ATTACHMENTS log messages for now.Justin Clark-Casey (justincc)2012-04-251-15/+14
| | * Comment out the noisier AVFACTORY log messages for now.Justin Clark-Casey (justincc)2012-04-251-4/+6
| | * Improve teleport log debug and error messages to tell us who is teleporting.Justin Clark-Casey (justincc)2012-04-251-3/+14
| | * Go back to always using the local timezone for now - not all machines have US...Justin Clark-Casey (justincc)2012-04-241-13/+18
| | * Revert "Refactored how asset/inventory types are associated with content type...Justin Clark-Casey (justincc)2012-04-242-177/+228
| | * Minor improvements to loggingOren Hurvitz2012-04-246-12/+24
| | * Refactored how asset/inventory types are associated with content types: gathe...Oren Hurvitz2012-04-242-228/+177
| | * Fixed problem with MySQL: it was possible for one thread to use an incomplete...Oren Hurvitz2012-04-243-21/+37
| | * When reading a region, use null objects to represent NULL fields.Oren Hurvitz2012-04-241-1/+5
| | * OSSL: fixed the threat level check for osParseJSONNewOren Hurvitz2012-04-241-1/+1
| | * minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chief...Justin Clark-Casey (justincc)2012-04-241-1/+6
| | * DST settings to match client default Pacific Time (mantis #5972)Olivier van Helden and Gudule Lapointe (Speculoos.net)2012-04-241-1/+15
| | * Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed ...Justin Clark-Casey (justincc)2012-04-241-0/+1
| | * Changed the Map-related messages from Info to Debug. They're debug messages.Diva Canto2012-04-234-8/+8
| | * Add online/offline indicator to "friends show" region console command.Justin Clark-Casey (justincc)2012-04-241-3/+14
| | * Add osForceAttachToAvatar() and osForceDetachFromAvatar()Justin Clark-Casey (justincc)2012-04-246-49/+127
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-236-58/+120
| | |\
| | * | Replace common code to fetch self inventory item (as opposed to uuid) with Ge...Justin Clark-Casey (justincc)2012-04-231-155/+76
| | * | refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_ApiJustin Clark-Casey (justincc)2012-04-231-94/+42
| * | | Add try/catch around Json script method registration to avoild some issuesMic Bowman2012-04-251-15/+24
* | | | Add a version of osNpcSay that takes a channel number Mantis 5747Talun2012-04-266-10/+144
| |_|/ |/| |
* | | Mantis 5977 Corrections to llRegionSayToTalun2012-04-236-58/+120
| |/ |/|
* | refactor: simply some properties code in BasicPhysicsPluginJustin Clark-Casey (justincc)2012-04-222-72/+12
* | Make TestSetPhysicsSinglePrim() actually add the object to the scene in order...Justin Clark-Casey (justincc)2012-04-221-0/+2
* | Fix bug where setting phantom on a prim would result in a server log message ...Justin Clark-Casey (justincc)2012-04-226-32/+382
* | Comment out spurious Body != IntPtr.Zero code after disableBody(), since disa...Justin Clark-Casey (justincc)2012-04-212-10/+20
* | refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.Justin Clark-Casey (justincc)2012-04-211-115/+117
* | Add test for setting physics in a linksetJustin Clark-Casey (justincc)2012-04-211-2/+28
* | Add regression test for prim status when root prim in a new linkset is non-ph...Justin Clark-Casey (justincc)2012-04-212-1/+20
* | Fix a bug where linking a non-physical prim with a physical prim as root woul...Justin Clark-Casey (justincc)2012-04-212-0/+22
* | Add test for correct physics status on linking two physics objectsJustin Clark-Casey (justincc)2012-04-211-2/+26
* | refactor: extract common setup code in SceneObjectStatusTestsJustin Clark-Casey (justincc)2012-04-211-10/+16
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-04-212-120/+95
|\ \
| * | Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.Justin Clark-Casey (justincc)2012-04-211-116/+88
| * | Improve bitmap disposal to do null checks and not to potentially try disposal...Justin Clark-Casey (justincc)2012-04-201-4/+7
* | | Add TestSetPhysics() to SOP status testsJustin Clark-Casey (justincc)2012-04-213-4/+27
|/ /