aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | 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-131-10/+24
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
| * | | 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"
| * | | | 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.
| * | | | 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.
* | | | | Merge branch 'master' into careminsterMelanie2012-12-0916-93/+1317
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Restrict IPresenceData.VerifyAgentBlueWall2012-12-094-17/+17
| |/ / / | | | | | | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result
| * | | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2012-12-085-91/+111
| |\ \ \
| | * | | BulletSim: set material properties for static objects. Move ↵Robert Adams2012-12-082-11/+24
| | | | | | | | | | | | | | | | | | | | Linkset.MakeStatic() after call to ForceActivationState2() since linkset might change activation state. Make BSPrim.CreateGeomAndObject public as linkset rebuilding might need access to it. Only rebuild prim if selection state is actually changes -- OpenSimulator calls PhysObject.Selected() multiple times whenever a prim is selected or deselected.
| | * | | BulletSim: fix small problem with setting size/scale of native shapes which ↵Robert Adams2012-12-081-6/+9
| | | | | | | | | | | | | | | | | | | | caused the native shapes to be rebuilt when not necessary.
| | * | | BulletSim: update comments and add more to TODO list.Robert Adams2012-12-082-4/+10
| | | | |
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-082-2/+2
| | |\ \ \
| | * | | | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
| * | | | | Add agent verification to PresenceBlueWall2012-12-084-0/+36
| | |/ / / | |/| | |
| * | | | Format changeBlueWall2012-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | Removed some white space in a line, looking to trigger a build
| * | | | Prebuild fixBlueWall2012-12-071-1/+1
| |/ / / | | | | | | | | | | | | Had moved the class to a different namespace but failed to add the reference
| * | | Merge branch 'master' into connector_pluginBlueWall2012-12-0748-794/+2173
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-12-0627-416/+1133
| | |\ \ \
| | * | | | Trying to prevent old route of sending attachments, simulator version ↵Diva Canto2012-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | unknown maybe due to timeout. mantis #6450
| * | | | | Merge branch 'master' into connector_pluginBlueWall2012-11-269-338/+571
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-11-25433-8669/+13247
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Base/ServicesServerBase.cs
| * \ \ \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-2059-1365/+2957
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into connector_pluginBlueWall2012-10-1918-59/+135
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Move PluginManagerBlueWall2012-10-194-11/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PluginManager out to OpenSimFramework for general use
generated by cgit v1.1 at 2024-12-21 08:59:27 +0000