aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | Add logging to help track sequence of eventsBlueWall2012-10-111-0/+2
| | | | | | | |
| * | | | | | | Implement plugin unloadingBlueWall2012-10-102-4/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Plugin may be enabled and disabled on the fly.
| * | | | | | | Fix registry issueBlueWall2012-10-091-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rebuild registry if loading from a local dll to give access to the addin data for it on the first pass.
| * | | | | | | missed some conflict markupBlueWall2012-10-091-1/+0
| | | | | | | |
| * | | | | | | Merge branch 'master' into connector_pluginBlueWall2012-10-0928-117/+683
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/ServerMain.cs
| * | | | | | | | Added parts to manage repositories and plugin managementBlueWall2012-10-065-0/+1028
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is working - more testing to follow, then soem documentation
| * | | | | | | | Merge branch 'master' of /home/opensim/var/repo/opensim into modular_configBlueWall2012-10-0323-326/+727
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Add modular configuration for Robust connectorsBlueWall2012-10-033-0/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can provide modular ini for connectors... look for our configuration in the following places... 1) in the default ini/-inifile 2) in the named file (ConfigName) located in the configured directory (see Robust[.HG].ini [Start] section for ConfigDirectory) 3) in the repository named in the connector (ConfigURL) In this case, the file will be written into the configured directory with the specified See example connector/service @ https://github.com/BlueWall/SlipStream for testing.
* | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-0727-416/+1133
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-12-076-358/+461
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BulletSim: rewrite and improve vehicle angularDeflection, verticalAttraction,Robert Adams2012-12-062-83/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linearMotorUp and related vehicle forces. Fixed problems with downward vehicle position correction forces being too large. Add vehicle collision flag so can sense whether vehicle is on the ground.
| | * | | | | | | | | BulletSim: update and add to the TODO list.Robert Adams2012-12-061-31/+56
| | | | | | | | | | |
| | * | | | | | | | | BulletSim: add detail logging detail flag so I don't have to comment and ↵Robert Adams2012-12-061-27/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncomment the detail logging when changing the depth of logged info.
| | * | | | | | | | | BulletSim: only check position sanity if the prim is physical -- the user ↵Robert Adams2012-12-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can do anything dumb they wish.
| | * | | | | | | | | BulletSim: add values for material friction and restitution. Fix line ↵Robert Adams2012-12-061-191/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | endings in material definition file.
| | * | | | | | | | | BulletSim: Don't add gravity to down force -- let Bullet do that. Add ↵Robert Adams2012-12-061-14/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VehicleAddForce to set of managed vehicle prim properties.
| | * | | | | | | | | BulletSim: Vehicle angular vertical attraction works. Other vehicle angular ↵Robert Adams2012-12-062-20/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forces commented out for the moment for debugging.
| * | | | | | | | | | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ↵Justin Clark-Casey (justincc)2012-12-072-1/+511
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aim of avoiding OpenSimulator problems due to script thread aborts. When an object is removed, its scripts are stopped and then the thread running them is aborted if stop takes too long. However, it appears that aborting a thread at just the wrong moment when it is obtaining a ReaderWriterLockSlim lock can leave this lock in an inconsistent state. One symptom of this is that mono leaps to 100% cpu and a vm thread dump reveals lots of threads waiting for a ReaderWriterLockSlim lock without any thread actually holding it. This is probably the same problem as encountered originally in commit 12cebb12 This commit looks to plaster this problem by putting lock obtaining methods inside finally blocks which should be uninterruptible by thread aborts.
| * | | | | | | | | minor: change method doc on GetTextureHandler.TryParseRange(), mainly to ↵Justin Clark-Casey (justincc)2012-12-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trigger another build
| * | | | | | | | | Allow GetTexture calls with no second value in the range header (e.g. just ↵Justin Clark-Casey (justincc)2012-12-061-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5333-) It looks like the latest Kokua is doing this. As per http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html, leaving off the second value is legal This indicates the caller wants the rest of the entity.
| * | | | | | | | | Instead of printing script errors out to console, put to debug log so that ↵Justin Clark-Casey (justincc)2012-12-061-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we also get timestamps. This commit also adds script name, part name, uuid, etc. for later identification. This information has been sent to console since 2009 but may be turned down if it proves too noisy. However, I still currently need it to investigate some region problems probably triggered by scripting.
| * | | | | | | | | minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-055-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | overriding OpenSimTestCase.SetUp()
| * | | | | | | | | Add engine-wide events queued and events processed numbers to output of ↵Justin Clark-Casey (justincc)2012-12-051-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "xengine status" console command. For debugging purposes.
| * | | | | | | | | Remove some mono warnings in script tests, chiefly where SetUp() wasn't ↵Justin Clark-Casey (justincc)2012-12-055-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly calling to OpenSimTestCase.SetUp()
| * | | | | | | | | Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵Justin Clark-Casey (justincc)2012-12-053-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | callers to lock and directly inspect the EventQueue
| * | | | | | | | | For now, sort "show scripts" output in descending order sorted by events ↵Justin Clark-Casey (justincc)2012-12-051-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | processed. For debug purposes - should later add options to allow different sorting or show only highest 10, etc.
| * | | | | | | | | Add IScriptInstance.EventsProcessed stat so that we can record this ↵Justin Clark-Casey (justincc)2012-12-053-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | information and display in "show scripts" for debug purposes
| * | | | | | | | | Remove very probably unused PrimitiveBaseShape(bool) constructor to reduce ↵Justin Clark-Casey (justincc)2012-12-051-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code complexity
| * | | | | | | | | Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this ↵Justin Clark-Casey (justincc)2012-12-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is ignored by the ExtraParams properly anyway
| * | | | | | | | | minor: tidy up spacing at bottom of MundaneFrameworkTestsJustin Clark-Casey (justincc)2012-12-051-6/+2
| | | | | | | | | |
| * | | | | | | | | In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵Justin Clark-Casey (justincc)2012-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | than creating a new CultureInfo separately
generated by cgit v1.1 at 2024-10-23 21:15:38 +0000