aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would ↵Justin Clark-Casey (justincc)2013-02-061-15/+0
| | | | | | | | | return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name. This would practically never happen. This makes this overloaded version of the function consistent with the other version. It looks like this accidentally came over in commit c5af16a from Tue Oct 16 12:40:21 2012 However, there's arguably a case for looking for an item name that matches a UUID before assuming that the identifier is already an asset ID.
* refactor: Move functions that lookup asset ids from task inventory or pass ↵Justin Clark-Casey (justincc)2013-02-061-0/+122
| | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions.
* Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-052-1/+24
|\
| * Added DynAttrs to the serialized XML format of prims. When copying prims, ↵Oren Hurvitz2013-01-252-0/+16
| | | | | | | | use deep copy for DynAttrs.
| * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting ↵Justin Clark-Casey (justincc)2013-01-251-2/+2
| | | | | | | | | | | | from it This is the easier way to give us control over locking, rather than asking that OSDMap IDictionary methods be virtual
| * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-251-1/+8
| |
* | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | minor: change comment about assuming script references are textures in ↵Justin Clark-Casey (justincc)2013-02-021-1/+2
| | | | | | | | UuidGatherer since this is no longer the behaviour.
* | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-021-2/+5
| | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
* | Sit and Spin reduction. If sitting, slam avatar angular velocity to zero.teravus2013-02-011-2/+3
| |
* | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-301-0/+1
|\ \
| * | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-301-0/+1
| | | | | | | | | | | | a particular UUID.
* | | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-1/+6
|/ / | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | * This adds a bit more to the previous flying roll effect by adding ↵teravus2013-01-301-10/+50
| | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback.
* | * Adds a satisfying angular roll when an avatar is flying and turning. ↵teravus2013-01-301-0/+81
| | | | | | | | (General, not physics). Makes flying not feel as stiff.
* | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-5/+6
| | | | | | | | | | | | | | | | | | 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
* | Add OnScriptMovingStartEvent and OnScriptMovingEndEvent to EventManager so ↵Justin Clark-Casey (justincc)2013-01-261-0/+56
|/ | | | | | | | 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.
* * This makes the non-physics llCastRay 'better'. It's not 'correctly ↵teravus2013-01-231-0/+1
| | | | working', and if you look deep enough, you see that the results are not really stable depending on the direction of the ray.
* Add the Avination physics raycast glue so Core Physics can implement raycastMelanie2013-01-231-0/+13
|
* Have SOP and LSL_Api call the proper GetCenterOfMass and GetGeometricCenterRobert Adams2013-01-211-0/+10
| | | | | routines on the physics engine. Won't make a difference for any existing scripts since ODE always returned Vector3.Zero.
* Check the existing ScenePresence.ParentPart to make sure we're not trying to ↵Justin Clark-Casey (justincc)2013-01-191-2/+1
| | | | | | | sit on a prim we're already sat upon, rather than looking up the part from scratch. An adaptation of commit 055b8a2 Having both ParentID and ParentPart references now is redundant. ParentID should probably be eliminated.
* Add "debug set set animations true|false" region console command.Justin Clark-Casey (justincc)2013-01-182-5/+33
| | | | | Setting this logs extra information about animation add/remove, such as uuid and animation name Unfortunately cannot be done per client yet
* Restore previous client AO behaviour by not allowing them to remove the ↵Justin Clark-Casey (justincc)2013-01-183-6/+25
| | | | | | | | | default animation but continue to allow scripts to do so. This keeps the fix from http://opensimulator.org/mantis/view.php?id=6327 and fixes the behaviour regression in http://opensimulator.org/mantis/view.php?id=6483 Animations may still exhibit different behaviour if both scripts and clients are adjusting animations. A change in the behaviour of client AO to not remove all animations may be a better long term approach.
* Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
| | | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented. This commit, unlike 1b5c41c, passes the wait handle as an extra parameter through IScript.Initialize() instead of passing IScriptInstance itself.
* Revert "Implement co-operative script termination if termination comes ↵Justin Clark-Casey (justincc)2013-01-161-23/+3
| | | | | | | | during a script wait event (llSleep(), etc.)" Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api. This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-01-161-0/+4
|\
| * move resit fix to ScenePresence.cs and allow for requesting sit on objects ↵dahlia2013-01-141-0/+4
| | | | | | | | other than the object currently sat on
* | Implement co-operative script termination if termination comes during a ↵Justin Clark-Casey (justincc)2013-01-161-3/+23
|/ | | | | | | | | script wait event (llSleep(), etc.) This makes use of EventWaitHandles since various web references indicate that Thread.Interrupt() can also cause runtime instability. If co-op termination is enabled, then termination sets the wait handle instead of waiting for a timeout before possibly aborting the thread. This allows the script to cleanly terminate if it's in a llSleep/LL function delay or the next time it enters such a wait without any timeout period. Co-op termination is not yet testable since checking for termination request within loops that never trigger a wait is not yet implemented.
* Fix exception reporting in SceneObjectPart so it logs what the exception is ↵Robert Adams2013-01-111-2/+2
| | | | rather than just saying it happened.
* Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-0/+3
| | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-102-94/+102
| | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* refactor: route the final scene backup through the same code that handles ↵Justin Clark-Casey (justincc)2013-01-101-10/+1
| | | | | | periodic backup This is rather than making unnecessary duplicate checks that the SOG later performs again.
* Add "debug scene pbackup true|false" console command. This enables or ↵Justin Clark-Casey (justincc)2013-01-101-9/+30
| | | | | | disable periodic scene backup. For debug purposes. If false, scene is still saved on shutdown.
* Revert "Prevent empty Anim Packs"Melanie2013-01-091-12/+0
| | | | This reverts commit 5561333668f61f043cdfc0733a4eb50a1bcfb14e.
* Revert "Fix sequence id fr default anim"Melanie2013-01-091-1/+1
| | | | This reverts commit a775931a0cec9f65748c6e20dd2695edcbe21b7f.
* Fix sequence id fr default animMelanie2013-01-081-1/+1
|
* Prevent empty Anim PacksMelanie2013-01-081-0/+12
|
* Fix llGetLinkKey() to return the last sat avatar as the last link number.Justin Clark-Casey (justincc)2013-01-042-46/+68
| | | | | | | | As per http://wiki.secondlife.com/wiki/LlGetLinkKey This is done by keeping a scene-object wide list of sitters. This also fixes bugs in this function where linknums 0 and 1 weren't treated properly if there were sitting avatars on a single prim. This also fixes a minor race condition for multiple concurrent sitters on a prim with no current sitters by locking on the object-wide list rather than individual sop lists Addresses http://opensimulator.org/mantis/view.php?id=6477
* Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-022-35/+6
| | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
* ScenePresence passes the avatar rotation down to the physics engine. This ↵Robert Adams2012-12-281-0/+4
| | | | will be a no-op for ODE but enables asymmetrical avatars for BulletSim.
* Add check to always push terse updates for presences that have new ↵Robert Adams2012-12-271-3/+8
| | | | velocities of zero.
* Replace axis rotation numeric constants (STATUS_ROTATE_XYZ) with symbols. ↵Robert Adams2012-12-182-6/+15
| | | | Also made it so llSetStatus() can individually enable disable rotation axi using the bitmask of flags.
* BulletSim: experimentally remove unit displacement from prim border crossing ↵Robert Adams2012-12-161-2/+13
| | | | test. This seems to cause border crossing to be sensed either a little early or a little late depending on which directin the object is moving. If border crossings become totally borked or someone remembers why this was displacement was done, revert this change.
* 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)
* 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
* 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
* 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.
* UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-1/+1
| | | | Inventory transfers: don't do async on asset transfers or now.