Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 1 | -36/+54 |
|\ | | | | | | | This was rather conflicted. Please test linking. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -26/+38 |
| |\ | | | | | | | | | | | | | | | | | | | Resolve merge conflicts Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | | Improve consistency of locking for SOG.m_parts in order to avoid race ↵ | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -45/+66 |
| | | | | | | | | | | | | conditions in linking and unlinking | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-25 | 1 | -0/+36 |
|\ \ \ | | |/ | |/| | |||||
| * | | Make scene object directories more robust and prevent deleted SOP's from | Melanie Thielker | 2010-08-25 | 1 | -17/+29 |
| |/ | | | | | | | sticking around | ||||
| * | Split out actual scene object insertion code from Scene.Inventory.RezObject ↵ | Justin Clark-Casey (justincc) | 2010-08-24 | 1 | -0/+36 |
| | | | | | | | | | | | | | | | | and move into SceneGraph.AddNewSceneObject() The new SceneGraph method is more consumable by region modules that want to extract objects from inventory and add them to the scene in separate stages. This change also reduces the number of redundant client updates scheduled when an object is rezzed directly by a script or region module This code does not touch direct rez by a user | ||||
* | | Change object cleanup again. Make scene object directories more robust and | Melanie Thielker | 2010-08-25 | 1 | -17/+29 |
| | | | | | | | | prevent deleted SOP's from sticking around | ||||
* | | Fix minimap issues. This addresses mantis #228. | meta7 | 2010-08-08 | 1 | -21/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-07 | 1 | -1/+6 |
|\ \ | |/ | |||||
| * | Add new SceneGraphTests class. Add simple TestDuplicateObject() | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -1/+1 |
| | | |||||
| * | minor: a few miscellaneous comments | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -0/+5 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-31 | 1 | -5/+0 |
|\ \ | |/ | |||||
| * | remove unused BasicQuadTreeNode | Justin Clark-Casey (justincc) | 2010-07-30 | 1 | -5/+0 |
| | | |||||
| * | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
| * | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms. | ||||
| * | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
* | | Allow megaregions to be used in M7, should we so decide | Melanie Thielker | 2010-07-21 | 1 | -22/+25 |
| | | |||||
* | | Remove AgentID and GroupOD from the signature of SOG.Copy(). They were never | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | used, but made for a very mispleading read of the code in the callers. | ||||
* | | Fix Copy on Ray, Drag Copy and other little things. Removed the wrong and | Melanie Thielker | 2010-06-28 | 1 | -1/+1 |
| | | | | | | | | | | | | | | nonworking ownership assignment in SOG, which messed things up before. No longer trust the client to send the ID of the person something is copied as, since it allows to run a script with someone else's permissions. Properly adjust inventory ownership and perms. | ||||
* | | Make drag copy and copy-on-ray handle friends list perms properly | Melanie Thielker | 2010-06-27 | 1 | -0/+22 |
| | | |||||
* | | Add new event: OnChangedBackup | Tom Grimshaw | 2010-06-25 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-25 | 1 | -6/+7 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 1 | -6/+7 |
| |\ \ | | |/ | |||||
| | * | stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵ | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+7 |
| | | | | | | | | | | | | | | | | | | isn't present in the presence dictionary the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place | ||||
* | | | Add two events: OnAttachToBackup and OnDetachFromBackup. | Tom Grimshaw | 2010-06-25 | 1 | -0/+26 |
|/ / | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-09 | 1 | -0/+37 |
|\ \ | |/ | |||||
| * | Refactor SendCoarseLocations for better performance. Instead of computing ↵ | Dan Lake | 2010-06-08 | 1 | -0/+37 |
| | | | | | | | | list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-08 | 1 | -3/+7 |
|\ \ | |/ | |||||
| * | Reduce number of full updates sent on region crossing for attachments/huds ↵ | Justin Clark-Casey (justincc) | 2010-06-08 | 1 | -3/+7 |
| | | | | | | | | | | | | | | | | | | to 1 from 3 This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed This code is a foreport from the equivalent changes in 0.6.9-post-fixes | ||||
| * | Fix create selection getting overwritten by multiple updates for the same prim. | Melanie Thielker | 2010-05-31 | 1 | -1/+1 |
| | | |||||
* | | Fix create selection getting overwritten by multiple updates for the same prim. | Melanie Thielker | 2010-05-31 | 1 | -1/+1 |
| | | |||||
* | | Implement suspended updates - When an operation is occurring on lots of ↵ | Tom Grimshaw | 2010-05-29 | 1 | -11/+36 |
| | | | | | | | | prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -45/+48 |
|\ \ | |/ | |||||
| * | rearrange SceneGraph.AddSceneObject() to return earlier if an object with ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -53/+49 |
| | | | | | | | | | | | | that uuid is already in the scene this means that we don't perform pointless work | ||||
| * | Fix a problem where SceneGraph.AddSceneObject() would return false on ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -7/+14 |
| | | | | | | | | | | | | successfully adding an object rather than true, in defiance of its method documentation This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added. | ||||
| * | Refactor scene presence list for lockless iteration. Lock contention will ↵ | Dan Lake | 2010-05-15 | 1 | -61/+53 |
| | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene. | ||||
| * | Fix link security issue | Melanie | 2010-04-30 | 1 | -32/+9 |
| | | |||||
* | | Refactor scene presence list for lockless iteration. Lock contention will ↵ | Melanie | 2010-05-21 | 1 | -82/+49 |
| | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene. | ||||
* | | Optimise the heavily used GetScenePresences; eliminate the array->list ↵ | Tom Grimshaw | 2010-05-12 | 1 | -8/+48 |
| | | | | | | | | conversion on every call and transition from hard locks to ReaderWriter locks. | ||||
* | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-30 | 1 | -32/+9 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-30 | 1 | -32/+9 |
| |\ \ | |||||
| | * | | Fix link security issue | Melanie | 2010-04-30 | 1 | -32/+9 |
| | | | | |||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-05 | 1 | -21/+41 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix bug where approximately half the time, attachments would rez only their ↵ | Justin Clark-Casey (justincc) | 2010-03-09 | 1 | -21/+41 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do. Backport from head. | ||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 1 | -1/+10 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 1 | -3/+2 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable. | ||||
| * | | | refactor: crudely move DetachSingleAttachmentToGround() over to the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | AttachmentsModule | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 1 | -107/+79 |
|\ \ \ \ | |/ / / | |||||
| * | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. |