aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-283-3/+15
| |\
| | * 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-241-0/+7
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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-221-1/+9
| | |/ | |/| | | | | | | | | | | | | 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.
| | * remove pointless region handle paramter from IClientAPI.SendKillObject()Justin Clark-Casey (justincc)2013-05-092-3/+4
| | |
| | * Fix issue where objects removed via llDie() would not disappear for users ↵Justin Clark-Casey (justincc)2013-05-094-19/+91
| | | | | | | | | | | | | | | | | | | | | | | | looking in from neighbouring sims. This was because this particular code path (unlike user delete) only sent kills to root presences, for no apparent good reason. Added regression test for this case. This fixes http://opensimulator.org/mantis/view.php?id=6627
| | * minor: Simplify test setup in SceneObjectDeRezTests since permissions module ↵Justin Clark-Casey (justincc)2013-05-091-10/+4
| | | | | | | | | | | | doesn't need different configuration anymore
| * | Send up the part missing from the Avination Estate commit.Melanie2013-05-111-2/+0
| |/ | | | | | | Warning - contains a small migration.
* | Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-071-2/+3
| | | | | | | | (complete module) as changes are too extensive to apply manually
* | Merge branch 'master' into careminsterMelanie2013-05-061-5/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-062-9/+106
| |\
| * | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵Diva Canto2013-05-061-5/+17
| | | | | | | | | | | | to be added earlier for some of the checks to work correctly.
* | | Merge branch 'master' into careminsterMelanie2013-05-042-2/+18
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * | On startup, start scenes after we're set up all local scenes, rather than ↵Justin Clark-Casey (justincc)2013-05-032-2/+18
| | | | | | | | | | | | | | | | | | | | | starting scenes before others have been created. This aims to avoid a race condition where scenes could look to inform neighbours that they were up before those neighbours had been created. http://opensimulator.org/mantis/view.php?id=6618
| * | Some more pieces of Avination's ban system - if an avatar isn't allowed on anyMelanie2013-04-291-7/+88
| |/ | | | | | | parcel in the sim, keep them out entirely.
* | Merge branch 'master' into careminsterMelanie2013-04-251-0/+66
|\ \ | |/
| * UUIDGatherer now includes UUIDs which reference texture assets used as materialsdahlia2013-04-241-0/+66
| |
| * Add Avination's support for parcel eject and freezeMelanie2013-04-251-15/+25
| |
* | Merge branch 'master' into careminsterMelanie2013-04-211-9/+35
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs bin/OpenMetaverse.StructuredData.XML bin/OpenMetaverse.XML bin/OpenMetaverseTypes.XML
| * Materials-capable viewers send ImageUpdate packets when updating materials ↵dahlia2013-04-191-11/+35
| | | | | | | | that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed.
| * Allow changes to TextureEntry to propagate to viewers when MaterialID changesdahlia2013-04-171-0/+2
| |
generated by cgit v1.1 at 2024-12-30 14:26:50 +0000