aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'avination' into careminsterMelanie2013-01-274-44/+318
|\
| * Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-272-7/+9
| | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid.
| * Reinstate cleaning objects from parcel when avatars sit on them. Instead do itMelanie2013-01-262-2/+2
| | | | | | | | properly for temp-on-rez. Auto-return overrides sitting. Temp does not.
| * Stop temp-on-rez object from being deleted while an avatar sits on themMelanie2013-01-261-1/+1
| |
| * Merge branch 'teravuswork' into avinationMelanie2013-01-262-7/+277
| |\
| | * * This update is ugly as sin, but it 'fills in the blanks' of your ↵teravus2013-01-261-4/+259
| | | | | | | | | | | | appearance when your inventory items go missing. This repairs appearance from missing wearables immediately on the V1 appearance pipeline, the second login on Firestorm. It only replaces the essential body parts that are missing.. hair, skin, eyes, shape... so if you delete all your wearables, you will rez naked. Anyway, this is still experimental.. I need another day of playing with this to handle all of the situations. One thing that I still need to do is try and get the assets.. and if we can't get the assets for some reason, skip and replace that part of the outfit.
| | * Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-266-49/+72
| | |\
| | * | * Handle a NRE with Baked Textures that may result in a failed appearance. ↵teravus2013-01-221-3/+18
| | | | | | | | | | | | | | | | This may be an issue, or it may be a symptom.
| * | | bug fix: crash when too many collisions on a ode stepUbitUmarov2013-01-261-36/+40
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-01-272-7/+9
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-272-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid. Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
* | | | Merge branch 'master' into careminsterMelanie2013-01-264-6/+71
|\ \ \ \ | |/ / /
| * | | Fix issue where the "set terrain texture" console command did not tell the ↵Justin Clark-Casey (justincc)2013-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | viewers that textures had updated (hence they did not display the changes). Addresses http://opensimulator.org/mantis/view.php?id=6513
| * | | Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so ↵Justin Clark-Casey (justincc)2013-01-262-2/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that these can be triggered by future code (not yet implemented). Also hooks up moving_start and moving_end script events, eliminating itemID on XEngine EventManager methods since this is completely unused. An adaptation of the patch in http://opensimulator.org/mantis/view.php?id=6515 Thanks Garmin Kawaguichi and Signpost Marv.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-261-86/+116
| |\ \ \
| * | | | Mantis 6343: Turn a prim to flexy to OFF don't work llSetPrimParamsTalun2013-01-261-3/+10
| | | | | | | | | | | | | | | | | | | | Correction so that scripts can turn Flexi off as well as on.
* | | | | Merge branch 'master' into careminsterMelanie2013-01-268-119/+307
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | * This adds llVolumeDetect functionality to the C# implementation of BulletSim.teravus2013-01-251-86/+116
| |/ / /
| * | | minor: Fix full scene part console report to show proper Light* names rather ↵Justin Clark-Casey (justincc)2013-01-261-5/+5
| | | | | | | | | | | | | | | | than all wrongly FlexiDrag
| * | | minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to ↵Justin Clark-Casey (justincc)2013-01-261-0/+2
| | | | | | | | | | | | | | | | disable any enabled logging from previous tests
| * | | Disable json tests for now - I see this is failing on jenkins because mono ↵Justin Clark-Casey (justincc)2013-01-252-32/+29
| | | | | | | | | | | | | | | | | | | | | | | | 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does. Standardize logging in JsonStoreScriptModule and some minor code formatting.
| * | | See if getting the registering JsonReadNotecard with MethodInfo works around ↵Justin Clark-Casey (justincc)2013-01-251-2/+5
| | | | | | | | | | | | | | | | an apparent issue with registering methods with more than 5 parameters on mono 2.4.3
| * | | Increase logging by enabling during test setup rather than during individual ↵Justin Clark-Casey (justincc)2013-01-251-4/+6
| | | | | | | | | | | | | | | | tests of for JsonStore
| * | | Enable logging in new json store tests to find out why they fail on jenkins ↵Justin Clark-Casey (justincc)2013-01-251-4/+4
| | | | | | | | | | | | | | | | but not locally.
| * | | Add JsonTestPath() regression testJustin Clark-Casey (justincc)2013-01-251-0/+17
| | | |
| * | | Add regression test for JsonSetValue()Justin Clark-Casey (justincc)2013-01-251-0/+23
| | | |
| * | | minor: remove mono compiler warning in SceneCommandsModuleJustin Clark-Casey (justincc)2013-01-251-1/+1
| | | |
| * | | Add basic JsonGetValue() regression test.Justin Clark-Casey (justincc)2013-01-251-0/+17
| | | |
| * | | Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-252-1/+87
| | | |
| * | | BulletSim: reduce the force of gravity on ground vehicles when theyRobert Adams2013-01-241-0/+11
| | | | | | | | | | | | | | | | are on the ground. Makes them a little more stable.
* | | | Merge branch 'master' into careminsterMelanie2013-01-2519-191/+670
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | BulletSim: reduce the zeroing threshold for rotational velocity.Robert Adams2013-01-241-3/+1
| | | | | | | | | | | | | | | | | | | | Sometimes settling of a vehicle from gravity introduces small velocities that need to be kept.
| * | | BulletSim: disable CCD (continuious collision detection) andRobert Adams2013-01-241-3/+3
| | | | | | | | | | | | | | | | | | | | contact processing threshold since the first didn't solve tunneling problems but used resources and the latter caused instabilities.
| * | | BulletSim: zero motion on an object that we pop up because it isRobert Adams2013-01-241-1/+7
| | | | | | | | | | | | | | | | | | | | below terrain. If the position is being corrected because it is out of bounds, all other movement rules are out the window.
| * | | BulletSim: remove exception that can happen when setting physics parameters ↵Robert Adams2013-01-241-2/+2
| | | | | | | | | | | | | | | | from the console.
| * | | Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
| * | | Add JSONification of WebStats module. Adds a '?json' query parameterRobert Adams2013-01-2410-11/+281
| | | | | | | | | | | | | | | | | | | | | | | | to the fetch URL to return the data in JSON format. Also adds a simple 'sim.html' that uses JavaScript to display the JSON data. Not pretty but an example.
| * | | * Added in the manifold point dept on collision desc. In BulletSim engine ↵teravus2013-01-241-5/+64
| | | | | | | | | | | | | | | | BulletXNA.
| * | | * Repairs the Object updates, Collision updates, and Child Prim methods ↵teravus2013-01-241-164/+282
| | | | | | | | | | | | | | | | | | | | | | | | making the bulletXNA engine work again. * The only thing that had an issue was when creating a new RigidBody, BulletXNA didn't know the type SimMotionState and the upcast type is unknown in the constructor. Therefore, I had to update the IMotionState with a new method 'SetBody'. All of the duplicated type information has been removed and BulletXNA is not relying on any non-standard types external to the library.
| * | | * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-232-4/+18
| | | | | | | | | | | | | | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
| * | | Remove unnecessary System.Linq reference from Compiler.csJustin Clark-Casey (justincc)2013-01-241-1/+0
| | | | | | | | | | | | | | | | Hopefully will fix windows build via compile.bat
* | | | Merge branch 'avination' into careminsterMelanie2013-01-247-16/+36
|\ \ \ \ | | |/ / | |/| |
| * | | Make llGiveMoney async again. The return value is now the constant 1 to makeMelanie2013-01-241-8/+10
| | | | | | | | | | | | | | | | | | | | scripts work properly. Scripts will no longer receive a failure indication through this return value;
| * | | Reintroduce the return value of llGiveMoney. The grid will crash and burn ↵Melanie2013-01-243-12/+12
| | | | | | | | | | | | | | | | without it.
| * | | Null check the response body to make sure we're not crashing the script engineMelanie2013-01-241-0/+6
| | | |
| * | | Prevent double ground collisions and prefer the physics result if there is one.Melanie2013-01-231-3/+15
| | | | | | | | | | | | | | | | | | | | ODE is known to not see the ground sometimes on raycast so the double test is needed.
| * | | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-234-12/+12
| | | | | | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | | Merge branch 'master' into careminsterMelanie2013-01-244-4/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Disable the not very useful infinite recursion co-op termination tests for ↵Justin Clark-Casey (justincc)2013-01-241-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | now as they appear to cause failures with testing in jenkins. These tests are not very useful anyway as they never actually get a chance to try termination before the script runs out of stack
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-242-2/+4
| |\ \ \
generated by cgit v1.1 at 2024-12-21 04:51:22 +0000