aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Bare minimum to get the new bake module to compile with this old codeMelanie Thielker2014-11-101-0/+2
|
* Call the bake module each time we see a new attachment to see if the attachmentMelanie Thielker2014-11-101-0/+4
| | | | needs textures
* Fix a script load issueMelanie Thielker2014-10-301-1/+1
|
* Fix a condition checkMelanie Thielker2014-08-111-1/+1
|
* Make texture anims work right on singuMelanie Thielker2014-08-111-12/+19
|
* Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2014-07-162-17/+19
|\ | | | | | | into avination-current
| * Differentiate between requests only the owner should be able to do and thoseMelanie Thielker2014-04-261-3/+3
| | | | | | | | that managers can do when setting parcel data
| * Guard against Scene being null in attachments it the wearing avatar is in ↵Melanie Thielker2014-03-251-14/+16
| | | | | | | | the process of logging out.
* | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵UbitUmarov2013-09-197-17/+26
|\ \ | |/ | | | | into avination-current
| * Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-082-4/+6
| |
| * Harmonize the class name, ID and Name of the default perms moduleMelanie Thielker2013-09-083-8/+8
| |
| * Fix the root cause of keyframe motion region crossing offset - UpdateSceneObjectMelanie2013-08-252-23/+5
| | | | | | | | was being called twice on each crossing.
| * * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-08-241-2/+22
| | | | | | | | location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper.
| * Revert "* This increases accuracy when border crossing (the reason is.. ↵teravus2013-08-241-7/+7
| | | | | | | | | | | | the border crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop." This reverts commit 55400ff7be55b1c8dbededca68e6fce42cd6ce0f.
| * * This increases accuracy when border crossing (the reason is.. the border ↵teravus2013-08-231-7/+7
| | | | | | | | crossing code will use velocity to predict where the object should be, so setting it to zero. It still looses about 0.0045 per loop.
| * Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |
| * * This fixes having to select and deselect prim to get keyframemotion to ↵Melanie2013-06-131-0/+5
| | | | | | | | | | | | | | | | start running when pulled from data storage. Conflicts: OpenSim/Data/SQLite/SQLiteSimulationData.cs
* | keyframe: add more locks, change timming stop, added Suspend and resumeUbitUmarov2013-06-061-15/+64
|/
* Unsit seated avatars when an object is deletedMelanie2013-06-021-0/+8
|
* Stop sending velocity to avoid snap-backMelanie2013-05-311-1/+1
|
* Allow Linden trees to preserve their type when taken into inventory and ↵Melanie2013-05-261-0/+5
| | | | rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects.
* Port fix from justicc - decouple pay prices on drag-copied primsMelanie2013-05-241-0/+1
|
* Guard against trying to access terrain heights out of bounds. Clamp to sim.Melanie2013-05-111-1/+9
|
* Refactor to get closer to coreMelanie2013-05-111-1/+1
|
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-314-79/+95
|\
| * Merge branch 'master' into careminsterMelanie2013-03-291-5/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Check viewer 2/3 attachment calls against avatar appearance attachment data ↵Justin Clark-Casey (justincc)2013-03-291-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | rather than actually attached objects By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side. Initiating simulator-side is always necessary for version 1 viewers. This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
| * | Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminsterMelanie2013-03-293-1/+33
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for ↵Justin Clark-Casey (justincc)2013-03-293-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | scripts in attachments. This was because the script resumption in AttachmentsModule was firing the attach event instead. Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal. This is to resolve http://opensimulator.org/mantis/view.php?id=6578
| * | Merge branch 'master' into careminsterMelanie2013-03-291-21/+0
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Eliminate code which tries to restart attachment scripts in ↵Justin Clark-Casey (justincc)2013-03-291-18/+0
| | | | | | | | | | | | ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule
| * | Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminsterMelanie2013-03-291-27/+27
| |\ \ | | |/
| | * minor: comment out unused Scene.AgentCrossing() to reduce code complexityJustin Clark-Casey (justincc)2013-03-281-27/+27
| | |
| * | Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-7/+5
| |\ \ | | |/
| | * If the viewer has already rezzed any attachments itself, then ignore the ↵Justin Clark-Casey (justincc)2013-03-281-7/+5
| | | | | | | | | | | | | | | | | | simulator-side rez attachments call. This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
| * | Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminsterMelanie2013-03-291-2/+2
| |\ \ | | |/
| | * Fix regression tests by making a new NPC always trigger simulator side ↵Justin Clark-Casey (justincc)2013-03-281-2/+2
| | | | | | | | | | | | | | | | | | attachment code when created. Regression from previous commit c2093ccc. Failed because NPCs don't set the ViaLogin flag
| * | Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminsterMelanie2013-03-292-44/+38
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Move the simulator-side RezAttachments call on login to SP.MakeRootAgent ↵Justin Clark-Casey (justincc)2013-03-282-38/+31
| | | | | | | | | | | | | | | | | | | | | | | | with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary. This is to simplify the code (no tricky 'wasChild' signalling required) and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers) and the viewer-side attaching the v3 viewers perform.
| | * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-266-3/+9
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
| * | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-03-267-6/+11
| |\ \ | | | | | | | | | | | | careminster
| * \ \ Merge branch 'master' into careminsterMelanie2013-03-233-6/+22
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * | Fix teleporting into the non-SW 256x256 corner of a megaregion, though ↵Justin Clark-Casey (justincc)2013-03-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | currently with a 10 second delay before auto-reteleport to the correct location. This now does a check for border crossing (required to trigger the teleport) immediately in SP.MakeRootAgent(). If left any later, it looks like the physics scene changes the position and stops the cross happening. If done any earlier, nothing happens because the cross-code currently requires a PhysicsActor to be in place, thuogh it's probably not necessary for this case.
| | * | Add "show borders" command to show the borders of a region.Justin Clark-Casey (justincc)2013-03-233-6/+16
| | | | | | | | | | | | | | | | | | | | This is relevant to mega-regions where the borders are very different to a regular region. Also adds some method doc and other code comments.
* | | | Export permission, part two. Setting export perms for textures and clothing ↵Melanie2013-03-313-11/+66
| |_|/ |/| | | | | | | | | | | | | | works. Setting perms for prims also works but they don't propagate correctly yet. NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
* | | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-246-3/+9
| | | | | | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie2013-03-234-23/+144
|\ \ \ | |/ /
| * | Merge branch 'master' into careminsterMelanie2013-03-224-23/+144
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * On a teleport, lock m_agentsInTransit whilst we grab the value to check for ↵Justin Clark-Casey (justincc)2013-03-211-4/+4
| | | | | | | | | | | | completion just to be sure we're not using a thread cached version.
| | * minor: disable logging on regression TestCrossOnSameSimulator() that I ↵Justin Clark-Casey (justincc)2013-03-201-1/+1
| | | | | | | | | | | | accidentally left on a few commits ago.
generated by cgit v1.1 at 2024-12-22 12:58:31 +0000