aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-064-168/+107
|\ | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵Justin Clark-Casey (justincc)2013-02-063-168/+0
| | | | | | | | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused.
| * 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 'master' into careminsterMelanie2013-02-053-1/+24
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * 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.
* | | Merge branch 'master' into careminsterMelanie2013-02-042-5/+10
|\ \ \ | |/ /
| * | 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
| | |
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+1
|\ \ \ | |/ /
| * | Whitespace fix and removing unneccessary parenthesesMelanie2013-01-311-1/+1
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-311-226/+229
|\ \ \
| * | | Change keyframe motion to use a single timer for all objects. This is requiredMelanie2013-01-301-236/+229
| | | | | | | | | | | | | | | | | | | | to prevent slippage between objects that are meant to move synchronously or keep their relative positions/rotations.
| * | | Send moving_end event to scripts when keyframed motion ends.Melanie2013-01-271-0/+10
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-311-108/+106
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-01-301-0/+1
| |\ \ \
| * | | | 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>
* | | | | Merge branch 'master' into careminsterMelanie2013-01-312-0/+122
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
| * | | | Add JsonTestStore to determine if a JsonStore is associated withMic Bowman2013-01-301-0/+1
| |/ / / | | | | | | | | | | | | a particular UUID.
| * | | * 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.
* | | | Merge branch 'avination' into careminsterMelanie2013-01-271-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-6/+7
| | | | | | | | | | | | | | | | | | | | 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 'master' into careminsterMelanie2013-01-271-6/+7
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | 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
* | | | Merge branch 'master' into careminsterMelanie2013-01-261-0/+56
|\ \ \ \ | |/ / /
| * | | 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.
* | | Merge branch 'master' into careminsterMelanie2013-01-251-0/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | * 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
| | |
* | | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \ \ | | |/ | |/|
| * | Fix a type (Suports => Supports). Also put the normal terrain collision checkMelanie2013-01-231-2/+2
| | | | | | | | | | | | into the physics check patch for now since physics doesn't properly return land for some reason (as tested by Nebadon)
* | | Merge branch 'avination' into careminsterMelanie2013-01-232-10/+30
|\ \ \ | |/ /
| * | Add accessors to allow serializing rot and position targetsMelanie2013-01-211-2/+12
| | |
| * | Limit active at targets to 8Melanie2013-01-211-2/+6
| | |
| * | Prevent scene from holding references to SOGs with attargets beyond SOG deletionMelanie2013-01-211-6/+12
| | |
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-01-232-1/+3
|\ \ \ | | | | | | | | | | | | careminster
| * \ \ Merge branch 'avination'Melanie2013-01-192-1/+3
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ThrottleOutPacketType.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Avatar/Groups/GroupsModule.cs
| | * | dont send a full grp update on stopmovetotarget. just a rootpart terseUbitUmarov2013-01-162-1/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-01-232-14/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2013-01-194-11/+59
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
generated by cgit v1.1 at 2024-12-23 07:32:41 +0000