aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-06-071-1/+2
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
| * Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
* | Merge branch 'master' into careminsterMelanie2013-06-061-3/+26
|\ \ | |/
| * Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| |
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-065-0/+64
| | | | | | | | may yield unexpected results in some cases. No database persistence yet,
| * Committing Avination's Keyframe module. This is not hooked up yet and will ↵Melanie2013-06-061-0/+766
| | | | | | | | do nothing. More commits to follow.
| * Avoid a deadlock where a script can attempt to take a ↵Justin Clark-Casey (justincc)2013-06-051-11/+21
| | | | | | | | | | | | | | | | ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order. This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless). The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region. This looks to address http://opensimulator.org/mantis/view.php?id=6557
* | Merge branch 'avination-current' into careminsterMelanie2013-06-066-2/+76
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| * | 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
| | |
| * | Small adjustments to the floater moduleMelanie2013-05-131-1/+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
| | |
| * | Add RegionManager level and the ability to use literal XML to the dynamic ↵Melanie2013-05-042-0/+2
| | | | | | | | | | | | floater module
| * | Controller module for dynamic floaters (WIP)Melanie2013-04-271-0/+51
| | |
| * | Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | | | | | | | | | compliant viewers
* | | Merge branch 'master' into careminsterMelanie2013-06-046-6/+184
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * | Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-302-4/+21
| | |
| * | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-302-0/+136
| | | | | | | | | | | | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations.
| * | Add region heartbeat start event to complement heartbeat end event.Robert Adams2013-05-302-0/+25
| | | | | | | | | | | | This allows object modification before the usual heartbeat operation.
| * | If on a sit request we sit the avatar on a different prim in a linkset for ↵Justin Clark-Casey (justincc)2013-05-301-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one. This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual. The original spot was by Vegaslon, this commit just goes about it in a slightly different way This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this. However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.
* | | Merge branch 'master' into careminsterMelanie2013-05-302-3/+10
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * | Try caching the user name for a new agent earlier on in the process of ↵Justin Clark-Casey (justincc)2013-05-291-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues. The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding. However, in theory the incoming agent should have made that binding before any such request is triggered. So moving this binding to an earlier point in the process to see if this makes a difference. Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache. This relates to http://opensimulator.org/mantis/view.php?id=6625
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-284-4/+22
| |\ \
| | * | One more appearance change: drop sending the SendAppearance packetMic Bowman2013-05-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | to avatar when it becomes root. This packet shows up in the viewer logs as an error and appears to cause problems for completing the texture rebake process for v1 viewers in some cases.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-205-15/+11
| |\ \ \
| * | | | Add commentDiva Canto2013-05-201-0/+2
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-05-242-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
| * | | | minor: Remove unnecessary duplication of AbsolutePosition Vector3 in SOG.Copy()Justin Clark-Casey (justincc)2013-05-241-1/+0
| | | | | | | | | | | | | | | | | | | | As a struct, Vector3 has already been cloned by MemberwiseClone()
| * | | | Fix issue where llSetPayPrice on either one of a clone prim in the same ↵Justin Clark-Casey (justincc)2013-05-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSimulator session would change the prices on both prims. This is because the PayPrice array refernence was being memberwise cloned and not the array itself. Addresses http://opensimulator.org/mantis/view.php?id=6639
| * | | | Fix bug where a cloned object would report the wrong llGetNumberOfPrims() ↵Justin Clark-Casey (justincc)2013-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when avatars had been sitting on the original and a different avatar sat on the copy within the same opensim session. This was because the sitting avatars list was being cloned rather than reset. Addresses http://opensimulator.org/mantis/view.php?id=6649
* | | | | Merge branch 'master' into careminsterMelanie2013-05-242-1/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Implement llSetSoundQueueing().Justin Clark-Casey (justincc)2013-05-222-2/+16
| | |/ / | |/| | | | | | | | | | | | | | | | | | This is controlled by the viewer, not the server. So as per http://wiki.secondlife.com/wiki/LlSetSoundQueueing, only two sounds can be queued per prim. You probably need to use llPreloadSound() for best results
* | | | Merge branch 'master' into careminsterMelanie2013-05-164-12/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | | On closing child agents, send separate asynchronous requests to each ↵Justin Clark-Casey (justincc)2013-05-163-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | neighbour rather than sending all closes concurrently on a separate thread. This is to reduce race conditions where neighbours may be responding erratically, thus mixing up create and close agent requests in time. This mirrors OpenSimulator behaviour on enabling child agents where each region is contacted separately.
| * | | On logout, send close child agent requests to neighbours asynchronously, so ↵Justin Clark-Casey (justincc)2013-05-161-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | user is not prevented from relogging if many neighbours are present but not responsive. The symptom here is that previous user connections are still present but are labelled active == false
| * | | Eliminate race condition where SimStatsReporter starts reportingRobert Adams2013-05-141-0/+3
| | | | | | | | | | | | | | | | stats before the region is completely initialized.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-141-0/+1
| |\ \ \ | | |/ /
| | * | Second take at HGTP-mesh bug: delay sending the initial data only for agents ↵Diva Canto2013-05-141-0/+1
| | | | | | | | | | | | | | | | that are coming via TP (root agents)
| * | | Comment out some debugging item permission messages since these are highly ↵Justin Clark-Casey (justincc)2013-05-141-3/+3
| |/ / | | | | | | | | | | | | | | | noisy on the console. Please re-enable when required
| * | Revert "HGTP-mesh bug: the mesh download requests were going to the ↵Diva Canto2013-05-141-3/+0
| | | | | | | | | | | | | | | | | | departing sims for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!" This reverts commit f32a21d96707f87ecbdaf42c0059f8494a119d31.
| * | HGTP-mesh bug: the mesh download requests were going to the departing sims ↵Diva Canto2013-05-141-0/+3
| | | | | | | | | | | | for a little while. This was also true for local TPs. BUt for local TPs the assets are on the same server, so it doesn't matter. For HGTPs, it matters. This potential fix moves sending the initial data to later, after the client has completed the movement into the region. Fingers crossed that it doesn't mess other things up!
* | | Merge branch 'master' into careminsterMelanie2013-05-121-29/+0
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Finalize the logic for SetHome. See comments in Land/LandManagementModule.cs ↵Diva Canto2013-05-111-19/+0
| | | | | | | | | | | | about who has permission to set home where.
* | | Merge branch 'master' into careminsterMelanie2013-05-117-49/+112
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs OpenSim/Services/LLLoginService/LLLoginService.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-05-117-47/+112
| |\ \
| | * | Don't send BulkUpdateInventory at the end up of UpdateInventoryItemAsset().Justin Clark-Casey (justincc)2013-05-091-1/+4
| | | | | | | | | | | | | | | | | | | | This is causing editing of worn clothes to fail frequently, possibly due to a race condition with a transaction. This looks to address http://opensimulator.org/mantis/view.php?id=6600
| | * | Only send one kill object to the deleter when they derez an object rather ↵Justin Clark-Casey (justincc)2013-05-092-17/+12
| | | | | | | | | | | | | | | | | | | | | | | | than two. Extend regression test to check this.
generated by cgit v1.1 at 2024-12-23 16:26:14 +0000