Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-12-09 | 4 | -17/+17 | |
|\ | ||||||
| * | Restrict IPresenceData.VerifyAgent | BlueWall | 2012-12-09 | 4 | -17/+17 | |
| | | | | | | | | Restrict IPresenceData.VerifyAgent to only return bool result | |||||
* | | UserManagementModule: search the local cache for names too. | Diva Canto | 2012-12-09 | 2 | -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 Canto | 2012-12-09 | 3 | -0/+0 | |
|/ | ||||||
* | Merge branch 'master' of /home/opensim/var/repo/opensim | BlueWall | 2012-12-08 | 7 | -91/+111 | |
|\ | ||||||
| * | Add back openjpeg dll for Windows | BlueWall | 2012-12-08 | 2 | -0/+0 | |
| | | | | | | | | May generate some error output during startup on Robust - ignore for now, will fix soon. | |||||
| * | BulletSim: set material properties for static objects. Move ↵ | Robert Adams | 2012-12-08 | 2 | -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 Adams | 2012-12-08 | 1 | -6/+9 | |
| | | | | | | | | caused the native shapes to be rebuilt when not necessary. | |||||
| * | BulletSim: update comments and add more to TODO list. | Robert Adams | 2012-12-08 | 2 | -4/+10 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-12-08 | 3 | -2/+3 | |
| |\ | ||||||
| * | | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵ | Justin Clark-Casey (justincc) | 2012-12-08 | 1 | -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 Presence | BlueWall | 2012-12-08 | 4 | -0/+36 | |
| |/ |/| | ||||||
* | | Format change | BlueWall | 2012-12-07 | 1 | -1/+1 | |
| | | | | | | | | Removed some white space in a line, looking to trigger a build | |||||
* | | One more time... | BlueWall | 2012-12-07 | 1 | -1/+1 | |
| | | | | | | | | needed one more "../" in the path (copy paste): Thanks BrucePatton for catching that one | |||||
* | | Prebuild fix | BlueWall | 2012-12-07 | 2 | -1/+2 | |
|/ | | | | Had moved the class to a different namespace but failed to add the reference | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-12-07 | 1 | -0/+5 | |
|\ | ||||||
| * | Added missing config var in grided sims. | Diva Canto | 2012-12-07 | 1 | -0/+5 | |
| | | ||||||
* | | Merge branch 'master' into connector_plugin | BlueWall | 2012-12-07 | 54 | -797/+2176 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-12-06 | 33 | -419/+1136 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-12-07 | 11 | -359/+462 | |
| | |\ | ||||||
| | | * | BulletSim: update DLLs and SOs with vehicle collision event check | Robert Adams | 2012-12-06 | 4 | -0/+0 | |
| | | | | ||||||
| | | * | BulletSim: rewrite and improve vehicle angularDeflection, verticalAttraction, | Robert Adams | 2012-12-06 | 2 | -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 Adams | 2012-12-06 | 1 | -31/+56 | |
| | | | | ||||||
| | | * | BulletSim: add detail logging detail flag so I don't have to comment and ↵ | Robert Adams | 2012-12-06 | 1 | -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 Adams | 2012-12-06 | 1 | -3/+1 | |
| | | | | | | | | | | | | | | | | can do anything dumb they wish. | |||||
| | | * | BulletSim: add values for material friction and restitution. Fix line ↵ | Robert Adams | 2012-12-06 | 1 | -191/+185 | |
| | | | | | | | | | | | | | | | | endings in material definition file. | |||||
| | | * | BulletSim: Don't add gravity to down force -- let Bullet do that. Add ↵ | Robert Adams | 2012-12-06 | 1 | -14/+28 | |
| | | | | | | | | | | | | | | | | VehicleAddForce to set of managed vehicle prim properties. | |||||
| | | * | BulletSim: Vehicle angular vertical attraction works. Other vehicle angular ↵ | Robert Adams | 2012-12-06 | 2 | -20/+38 | |
| | | | | | | | | | | | | | | | | forces commented out for the moment for debugging. | |||||
| | | * | fix openjpeg on 64 bit OSX we were pointing to a file taht did not | nebadon | 2012-12-06 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | exist. | |||||
| | * | | Use a thread abort safe version of OpenMetaverse.DoubleDictionary with the ↵ | Justin Clark-Casey (justincc) | 2012-12-07 | 2 | -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-06 | 1 | -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-06 | 1 | -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-06 | 1 | -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-05 | 5 | -5/+16 | |
| | | | | | | | | | | | | overriding OpenSimTestCase.SetUp() | |||||
| | * | Add engine-wide events queued and events processed numbers to output of ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -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-05 | 5 | -7/+13 | |
| | | | | | | | | | | | | properly calling to OpenSimTestCase.SetUp() | |||||
| | * | Add IScriptInstance.EventsQueued to match EventsProcessed instead of asking ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 3 | -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-05 | 1 | -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-05 | 3 | -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-05 | 1 | -12/+6 | |
| | | | | | | | | | | | | code complexity | |||||
| | * | Don't pointlessly set ExtraParams = byte[1] in PrimitiveBaseShape since this ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -3/+0 | |
| | | | | | | | | | | | | is ignored by the ExtraParams properly anyway | |||||
| | * | minor: tidy up spacing at bottom of MundaneFrameworkTests | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -6/+2 | |
| | | | ||||||
| | * | In BaseHttpServer.HandleRequest(), use Culture.SetCurrentCulture() rather ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -1/+1 | |
| | | | | | | | | | | | | than creating a new CultureInfo separately | |||||
| | * | In XEngine.DoOnRezScript() use Culture.SetCurrentCulture() instead of ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -2/+1 | |
| | | | | | | | | | | | | constructing a new CultureInfo separately | |||||
| | * | On XEngine.ProcessEventHandler(), instead of creating a new CultureInfo on ↵ | Justin Clark-Casey (justincc) | 2012-12-05 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | every call use the single one set by Culture.SetCurrentCulture() This is slightly different in that SetCurrentCulture() does not use overridden settings if the system culture matches en-US but some settings there have been changed. This is what we want - we do not want to use any system overriden settings. | |||||
| | * | minor: also comment out the debug log message which reports searching for ↵ | Justin Clark-Casey (justincc) | 2012-12-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | child agents in simulator scenes for now. | |||||
| | * | minor: Comment out "Delivering IM to..." messages for now. | Justin Clark-Casey (justincc) | 2012-12-04 | 1 | -3/+3 | |
| | | | ||||||
| | * | minor: Put Scene.PhysicsRequestAsset() into standard C# xml format. | Justin Clark-Casey (justincc) | 2012-12-04 | 1 | -4/+11 | |
| | | | ||||||
| | * | Add path references for Mono.Addins where they were missing for DataSnapshot ↵ | Justin Clark-Casey (justincc) | 2012-12-04 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | and UserStatistics. Should address http://opensimulator.org/mantis/view.php?id=6444 Appears that nant doesn't need these paths but building directly in monodevelop does. | |||||
| * | | Trying to prevent old route of sending attachments, simulator version ↵ | Diva Canto | 2012-12-06 | 1 | -1/+1 | |
| |/ | | | | | | | unknown maybe due to timeout. mantis #6450 |