aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-12-1643-533/+1160
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Make WebStatsModule properly handle scenes added or removed after initial ↵Justin Clark-Casey (justincc)2012-12-151-14/+31
| | | | | | | | | | | | startup. This may have been the cause of the DivByZero in http://opensimulator.org/mantis/view.php?id=6460
| * minor: If the physics module tells us that an object has gone out of bounds, ↵Justin Clark-Casey (justincc)2012-12-151-2/+5
| | | | | | | | more helpfully log the name, id, position and region of that object.
| * minor: Add commented out log lines to ScenePresenceAnimator for future debug ↵Justin Clark-Casey (justincc)2012-12-141-1/+10
| | | | | | | | use (such as logging anim pack contents sent to clients)
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-1413-301/+439
| |\
| | * BulletSim: Add more to the TODO list. Clean up and improve some comments.Robert Adams2012-12-132-10/+9
| | |
| | * Return the last set targetVelocity rather than the current velocity as the ↵Robert Adams2012-12-131-5/+8
| | | | | | | | | | | | default action made available in PhysicsActor.TargetVelocity. Doesn't change any physics operation but makes DSG work better as the targetVelocity value does not keep moving around.
| | * BulletSim: fix problem with continuious rebuilding of physical linksets. ↵Robert Adams2012-12-133-79/+88
| | | | | | | | | | | | This caused movement problems and large prim vehicles to take up a LOT of simulation time.
| | * BulletSim: correct line endings in new BulletSimData.cs file.Robert Adams2012-12-131-282/+282
| | |
| | * BulletSim: Add 'BulletSimData' which separates structures createdRobert Adams2012-12-137-205/+308
| | | | | | | | | | | | | | | | | | for the operation of BulletSim and those defintiions/structures defined so they can be used in the unmanaged world. Consolidate setting of collision flags so implementation is not scattered.
| | * BulletSim: remove extra linkset rebuilds.Robert Adams2012-12-131-18/+36
| | |
| | * Independently control logging for per region module loading. I just got sick ↵Robert Adams2012-12-131-0/+6
| | | | | | | | | | | | of, when debugging, the zillions of log lines verifying that each module is being added to each region.
| * | Fix issue where calling llVolumeDetect(FALSE) would not remove phantom flag, ↵Justin Clark-Casey (justincc)2012-12-142-2/+42
| |/ | | | | | | | | | | | | causing subsequent issues if physics was re-enabled. Added regression tests Addresses http://opensimulator.org/mantis/view.php?id=6365
| * minor: add some more detail to the logging if an LLClientView fails to ↵Justin Clark-Casey (justincc)2012-12-131-2/+4
| | | | | | | | process a packet
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-131-30/+6
| |\
| | * Simplify sit code a bit by determining correct animation in HandleSit ↵Dan Lake2012-12-131-30/+6
| | | | | | | | | | | | instead of HandleSitRequest. This eliminates m_nextSitAnimation, an unneeded state-saving variable in ScenePresence
| * | Add WaitForEventCompletionOnScriptStop [XEngine] config param to ↵Justin Clark-Casey (justincc)2012-12-132-10/+28
| |/ | | | | | | | | | | | | OpenSimDefaults.ini to allow change of the wait time for an event to complete on script removal before aborting its thread Default is 1000, as has previously been the case. This parameter exists for further debug work concerning mono 2.10 crashes that may be related to locks not being removed on Thread.Abort
| * Fix formattingBlueWall2012-12-131-21/+24
| |
| * Fix module pathname handling for WindowsBlueWall (James Hughes)2012-12-131-16/+22
| |
| * Update mono addinsBlueWall2012-12-133-0/+0
| | | | | | | | Push a small fix for the mono addins
| * Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-1212-93/+228
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-137-71/+109
| | |\
| | | * BulletSim: fix problem of avatar's floating off the ground after unsitting. ↵Robert Adams2012-12-124-24/+27
| | | | | | | | | | | | | | | | Reworked size/scale logic so physical scale is kept in Bullet and physObject scale is the preferred size -- usually same as size but avatars are computed differently.
| | | * BulletSim: non-functional commenting and reorganization of material ↵Robert Adams2012-12-122-33/+49
| | | | | | | | | | | | | | | | attribute specifications.
| | | * BulletSim: updates and rearrangement of the TODO list.Robert Adams2012-12-121-14/+33
| | | |
| | * | Fix sounds so that they play from inventory after teleport rather than only ↵Justin Clark-Casey (justincc)2012-12-131-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
| | * Log situations where workitem event threads are aborted on stop request ↵Justin Clark-Casey (justincc)2012-12-121-3/+3
| | | | | | | | | | | | | | | | | | because they failed to complete event processing within the given timeout. This is for bug hunting purposes where thread aborts may be causing dangling lock issues and subsequent vm crashes on mono (with ReaderWriterLockSlim, etc.)
| | * Add "debug script log" command to allow setting a numeric debug level on ↵Justin Clark-Casey (justincc)2012-12-124-17/+113
| | | | | | | | | | | | | | | | | | | | | individual IScriptInstances for debugging purposes. Current, state changes and event fires can be logged for individual scripts. See command help for more details.
| | * Add asset id to "show script" and "show scripts" command output to make it ↵Justin Clark-Casey (justincc)2012-12-121-0/+1
| | | | | | | | | | | | easier to extract and inspect the script's asset via "dump asset"
| * | Move setting to correct locations in iniBlueWall2012-12-122-26/+25
| | |
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-1218-111/+353
| |\ \ | | |/
| | * BulletSim: do not return the current velocity for targetVelocity.Robert Adams2012-12-121-0/+11
| | |
| | * BulletSim: fix crash caused by the creation of a linkset child that is under ↵Robert Adams2012-12-111-4/+4
| | | | | | | | | | | | the terrain. Users can sure find some interesting corner conditions.
| | * BulletSim: protect character property setting to remove crash from taints ↵Robert Adams2012-12-112-21/+42
| | | | | | | | | | | | setting properties after the destroy character taint.
| | * BulletSim: protect prim property setting to remove crash from taints setting ↵Robert Adams2012-12-113-20/+45
| | | | | | | | | | | | properties after the destroy object taint has happened.
| | * BulletSim: modify LIMIT_MOTOR_UP to limit BOAT types to be at water rather ↵Robert Adams2012-12-111-2/+2
| | | | | | | | | | | | than ground level. This makes boats float at water level better but not perfectly. There probably needs to be some interaction between HOVER and LIMIT_MOTOR_UP.
| | * BulletSim: add ini file and command line parameters to controlRobert Adams2012-12-114-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | dumping of physical vehicle parameters (out of Bullet) on each simulation step and to optionally scale vehicle angular velocity by the time step. The latter looks to be part of a difference between angular parameters for ODE and BulletSim. SL docs say angular velocity is measured in radians/timeScale. Not sure if this is different than what ODE does.
| | * BulletSim: set mass for single prim linksets when going physical. This fixes ↵Robert Adams2012-12-111-1/+8
| | | | | | | | | | | | single prim vehicles not working (the surf board now zooms).
| | * BulletSim: comment out some chatty debug logging. Rearrange some code in ↵Robert Adams2012-12-102-5/+7
| | | | | | | | | | | | BSDynamics to make velocity vs force calculation clearer.
| | * BulletSim: Fix crash on the destruction of physical linksets.Robert Adams2012-12-1012-38/+155
| | | | | | | | | | | | | | | | | | | | | | | | | | | While fixing the above, add methods to physical body and shape pointer wrapper so routines won't have to know that IntPtr.Zero means no physical instance. Fix problem with physical linksets failing after a few sits and unsits by properly restoring child prom positions for compound linksets after multiple selection and deselections.
| | * BulletSim: some comments about rebuilding linksets (having to recompute and ↵Robert Adams2012-12-091-3/+6
| | | | | | | | | | | | restore a child's position in the world based on its position in the moved linkset).
| | * BulletSim: adjust friction and restitution based on material type.Robert Adams2012-12-092-5/+17
| | |
| | * HGAssetMapper: Get wasn't really working. It's true that some assets are ↵Diva Canto2012-12-091-3/+35
| | | | | | | | | | | | copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids.
| | * Switched the order by which foreign inventory and foreign assets are brought ↵Diva Canto2012-12-091-6/+4
| | | | | | | | | | | | in, to avoid race conditions on the client.
| * | Replace Mono.Addins librariesBlueWall2012-12-113-0/+0
| | | | | | | | | | | | Mono.Addins.Setup uses Ionic.Zip for compression. Libraries Compiled on Win32
| * | Hide some console output when initializing addin repositoryBlueWall2012-12-112-0/+29
| |/ | | | | | | We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-094-17/+17
| |\
| * | UserManagementModule: search the local cache for names too.Diva Canto2012-12-092-1/+11
| | | | | | | | | | | | Inventory transfers: don't do async on asset transfers or now.
| * | Replaced Mono.Addins dlls with ones compiled in Windows 64-bit.Diva Canto2012-12-093-0/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-12-0923-94/+1356
|\ \ \ | | |/ | |/|
generated by cgit v1.1 at 2024-12-14 08:57:08 +0000