aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Reinsert code for gathering uuids reference by materials back directly into ↵Justin Clark-Casey (justincc)2013-06-282-30/+99
| | | | | | | UuidGatherer for now. This cannot be triggered as an event from Scene.EventManager since some invocations of UuidGatherer (e.g. IAR saving) use scene objects which are not in scenes. There needs to be some way for modules to register for events which are not connected with a particular scene.
* refactor: Move code for gathering textures referenced by materials into ↵Justin Clark-Casey (justincc)2013-06-272-67/+33
| | | | | | MaterialsDemoModule from UuidGatherer This code is now triggered via EventManager.OnGatherUuids which modules can subscribe to.
* Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-9/+11
| | | | | | | | This is in order to reduce the likelihood of naming clashes, make it easier to filter in/out attributes, ensure uniformity, etc. All dynattrs in the opensim distro itself or likely future ones should be in the "OpenSim" namespace. This does alter the underlying dynattrs data structure. All data in previous structures may not be available, though old structures should not cause errors. This is done without notice since this feature has been explicitly labelled as experimental, subject to change and has not been in a release. However, existing materials data is being preserved by moving it to the "Materials" store in the "OpenSim" namespace.
* Improve situation where editing just the root prim of an attachment causes ↵Justin Clark-Casey (justincc)2013-06-251-1/+10
| | | | | | | other prims to be set to very far off positions on reattach. Functionally the same as the patch by tglion in http://opensimulator.org/mantis/view.php?id=5334 However, not yet perfect - after editing just root prim on reattach the position is still wrong, though other prims are not set to far off positions.
* Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ↵Justin Clark-Casey (justincc)2013-06-251-10/+4
| | | | structs
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-231-5/+5
|\
| * Fix other places when saving scripts or notecards in prim inventories where ↵Justin Clark-Casey (justincc)2013-06-181-5/+5
| | | | | | | | messages should be transient without an OK button
* | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
|/
* * This fixes having to select and deselect prim to get keyframemotion to ↵teravus2013-06-121-0/+5
| | | | start running when pulled from data storage.
* Add TriggerScenePresenceUpdated events when an animation is addedRobert Adams2013-06-113-3/+9
| | | | | | or removed. Shouldn't impact anyone as only DSG seems to use OnScenePresenceUpdated event. Some minor format changes to AnimationSet's ToString().
* * Adds KeyFrameMotion storage support to SQLite, just a note, seems that ↵teravus2013-06-111-2/+3
| | | | | | | there's still something wrong with keyframed motion starting when the sim starts up, you have to 'select' and 'deselect' the prim again to get it to appear to move. Not sure what this is but maybe melanie_t can comment on this. * Has a prim table migration.. that might take a while, hold on to your hats. * Fixes a null-ref when shutting down while keyframed motion is active.
* 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
* 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
* 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.
* 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.
| * 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
| * 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' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-205-15/+11
|\ \ | |/
| * 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
| |\
| * | 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
* | | Add commentDiva Canto2013-05-201-0/+2
| |/ |/|
* | 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)
* 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!
* 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' 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.
* Step 2: commit the IEstateModuleInterface changes neededMelanie2013-05-071-1/+2
|
* Step one of estate settings sharing - port the Avination Estate module ↵Melanie2013-05-072-3/+4
| | | | (complete module) as changes are too extensive to apply manually
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-062-9/+106
|\
| * 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.