aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-04-1026-998/+1603
|\ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * BulletSim: fixing problems with llMoveToTarget. Not all fixed yet.Robert Adams2013-04-093-6/+18
| |
| * BulletSim: some formatting changes.Robert Adams2013-04-091-10/+17
| |
| * Another algorithm for AngularVerticalAttraction. This one Takes into account ↵Vegaslon2013-04-091-0/+23
| | | | | | | | | | | | all rotations before it and makes the corrections more close to the time that sl does. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * BulletSim: add Bullet HACD library invocation. Turned off by default as notRobert Adams2013-04-093-94/+183
| | | | | | | | totally debugged. Updated DLLs and SOs with more debugged HACD library code.
| * BulletSim: fix problem where large sets of mega-regions weren't registeringRobert Adams2013-04-091-3/+3
| | | | | | | | all the terrain with the base region.
| * minor: fix mono compiler warning in ScriptsHttpRequests.csJustin Clark-Casey (justincc)2013-04-101-1/+0
| |
| * minor: remove mono compiler warnings in InventoryAccessModuleJustin Clark-Casey (justincc)2013-04-101-3/+2
| |
| * minor: Make exceptions thrown by MySQLAssetData more consistent.Justin Clark-Casey (justincc)2013-04-101-10/+19
| |
| * Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 ↵Justin Clark-Casey (justincc)2013-04-091-1/+1
| | | | | | | | 02:34:51 2013)
| * minor: Log an exception if we aren't able to delete a script state file ↵Justin Clark-Casey (justincc)2013-04-091-1/+6
| | | | | | | | | | | | rather than simply ignoring it. This should never normally happen but if it does then it can be valuable diagonstic information.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0913-828/+1258
| |\
| | * BulletSim: moving comments around. No functional change.Robert Adams2013-04-083-10/+11
| | |
| | * BulletSim: clean up actor code so routines use the same coding pattern.Robert Adams2013-04-0810-123/+137
| | | | | | | | | | | | Fix a few enabling problems.
| | * BulletSim: complete movement of physical object action code out of theRobert Adams2013-04-0811-636/+1078
| | | | | | | | | | | | | | | physical object and into actors for setForce, setTorque, hover, lock axis and avatar move.
| | * Optimize the number of Simian calls to get the initial presenceMic Bowman2013-04-071-110/+83
| | | | | | | | | | | | | | | | | | information for the friends list. This is a pretty big performance improvement on login. Note that you must upgrade simian to incorporate the corresponding GetSessions call.
| * | If OpenSimulator is writing a PID file and finds the file already present on ↵Justin Clark-Casey (justincc)2013-04-091-0/+5
| |/ | | | | | | | | | | startup, logging an error since this is commonly due to an unclean shutdown. Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
| * Fix taking (and rezzing) of coalesced objects in the non-root subregions of ↵Justin Clark-Casey (justincc)2013-04-064-53/+76
| | | | | | | | | | | | | | | | | | megaregions. This fixes the combined bounding box location for regions bigger than 256x256. It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead. It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region. Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595. Thanks!
| * When rezzing a coalesced object, check adjust position of all components.Justin Clark-Casey (justincc)2013-04-061-20/+27
| |
* | Merge branch 'master' into careminsterMelanie2013-04-051-1/+1
|\ \ | |/
| * * In between the fog, a moment of clarity. This fixes mantis 6570teravus2013-04-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-04-041-1/+1
|\ \ | |/
| * Fix XmlRpcAdmin admin_exists_user call so that it actually returns the last ↵Justin Clark-Casey (justincc)2013-04-041-1/+1
| | | | | | | | | | | | user login time rather than serializing the DateTime directly which generates a set of unexpected fields. lastlogin return is in unix timestamp format.
| * refactor: Simplify ScriptsHttpRequests.GetNextCompletedRequest to more ↵Justin Clark-Casey (justincc)2013-04-041-10/+4
| | | | | | | | simply iterate through pending requests without unnecessary checks.
| * Fix bug where outstanding llHTTPRequests for scripts were not being aborted ↵Justin Clark-Casey (justincc)2013-04-043-32/+76
| | | | | | | | | | | | | | | | | | when they were deleted. This was because AsyncCommandManager was handing an item ID to IHttpRequestModule.StopHttpRequest() rather than the expected request ID. This commit also makes the http request asynchronous using BeginGetResponse() rather than doing this by launching a new thread so that we can more safely abort it via HttpWebRequest.Abort() rather than aborting the thread itself. This also renames StopHttpRequest() to StopHttpRequestsForScript() since any outstanding requests are now aborted and/or removed.
* | Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminsterMelanie2013-04-042-14/+3
|\ \ | |/
| * minor: Stop falsely logging that a teleport was being aborted on client ↵Justin Clark-Casey (justincc)2013-04-031-3/+1
| | | | | | | | logout even when no teleport was active.
| * Fix minor race condition in SOP.SitTargetOrientationLL where inconsistent ↵Justin Clark-Casey (justincc)2013-04-031-11/+2
| | | | | | | | values could be returned if the sit orientation was changed whilst the property was being fetched.
* | Merge branch 'master' into careminsterMelanie2013-04-021-5/+6
|\ \ | |/
| * Use consistent GroupPosition value Make SOP.UpdateGroupPosition() rather ↵Justin Clark-Casey (justincc)2013-04-031-5/+6
| | | | | | | | than one that could change whilst the method is being executed.
* | Merge branch 'master' into careminsterMelanie2013-04-021-1/+1
|\ \ | |/
| * fix minor race condition in SOP.SitTargetPositionLL where inconsistency ↵Justin Clark-Casey (justincc)2013-04-031-1/+1
| | | | | | | | could occur if the sit target position changed whilst the property was fetched
* | Merge branch 'master' into careminsterMelanie2013-04-0218-231/+545
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * minor: Make SOP.UpdateOffset() more consistent by checking against the same ↵Justin Clark-Casey (justincc)2013-04-031-7/+7
| | | | | | | | old OffsetPosition rather than one which may vary if it simultaneously changes.
| * Fix minor race condition where SOP.GetGeometricCenter() and ↵Justin Clark-Casey (justincc)2013-04-021-4/+4
| | | | | | | | | | | | GetCenterOfMass() could return results which were never the case if these values were changed whilst the method was running No need to create new Vector3s since these are structs.
| * BulletSim: create axis lock constraint with proper orientation andRobert Adams2013-04-021-4/+2
| | | | | | | | enable axis lock functionality.
| * BulletSim: update unmanaged API for HACD parameter passing. Bullet HACDRobert Adams2013-04-013-6/+20
| | | | | | | | | | mesh to hull conversion calls in place but code not working. Update BulletSim DLLs and SOs for new API and HACD code.
| * BulletSim: rearrange mega-region terrain code to make the thread flowRobert Adams2013-04-011-15/+18
| | | | | | | | a little clearer.
| * Use Output instead of OutputFormat in appropriate places of XEngine status ↵Justin Clark-Casey (justincc)2013-04-021-2/+2
| | | | | | | | reporting.
| * minor: Remove unnecessary call to GetAttachments() in ↵Justin Clark-Casey (justincc)2013-04-021-2/+0
| | | | | | | | AttachmentsModule.UpdateUserInventoryWithAttachment()
| * Fix what appears to be a bug in HGUserManagementModule where it enables on ↵Justin Clark-Casey (justincc)2013-04-021-2/+1
| | | | | | | | the base.Name rather than its own Name.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-04-0213-203/+567
| |\
| | * BulletSim: stop an avatar from moving if standing on a stationaryRobert Adams2013-03-311-1/+8
| | | | | | | | | | | | | | | | | | object. This will stop avatars from sliding down steep terrains or objects while still allowing an avatar to be moved if standing on a moving object.
| | * BulletSim: not quite functional axis lock code.Robert Adams2013-03-315-35/+43
| | |
| | * BulletSim: start the renaming of local variables to m_ form to match the ↵Robert Adams2013-03-311-23/+23
| | | | | | | | | | | | OpenSim coding conventions.
| | * BulletSim: fix line endings in BSActor*Robert Adams2013-03-312-291/+302
| | |
| | * BulletSim: convert BSDynamic to a BSActor and change BSPrim to setRobert Adams2013-03-315-112/+149
| | | | | | | | | | | | up the vehicle actor.
| | * BulletSim: Add physical 'actors' that operate on the physical object.Robert Adams2013-03-314-74/+311
| | | | | | | | | | | | Add first 'actor' for locked axis.
| | * Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-313-10/+74
| | | | | | | | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
| * | Change recent MSSQL migrations to drop COLUMN from ALTER TABLE which is ↵Justin Clark-Casey (justincc)2013-04-021-6/+6
| |/ | | | | | | | | | | either not syntactical or unnecessary. May fix http://opensimulator.org/mantis/view.php?id=6593
generated by cgit v1.1 at 2024-12-14 22:06:19 +0000