Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Comment out unused ISceneViewer.Reset() to reduce code complexity | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -1/+1 | |
| | | ||||||
| * | In SceneViewer, introduce an IsEnabled flag and perform Close() under an ↵ | Justin Clark-Casey (justincc) | 2011-09-06 | 2 | -19/+51 | |
| | | | | | | | | m_pendingObjects lock in order to avoid the race condition seen by danbanner in http://opensimulator.org/mantis/view.php?id=5669 | |||||
| * | Get rid of the confusing version of ↵ | Justin Clark-Casey (justincc) | 2011-09-06 | 1 | -14/+0 | |
| | | | | | | | | IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false | |||||
| * | Try disabling the inconsistent attachment state check to see if this ↵ | Justin Clark-Casey (justincc) | 2011-09-05 | 1 | -9/+7 | |
| | | | | | | | | | | | | | | | | actually has an impact. The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary. This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message. This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672 | |||||
* | | Merge fixes, and fix the build | Tom | 2011-09-14 | 6 | -327/+161 | |
| | | ||||||
* | | First set of merge fixes | Tom | 2011-09-07 | 6 | -381/+147 | |
| | | ||||||
* | | Now merging the core changes. | Tom | 2011-09-04 | 1 | -421/+444 | |
| | | ||||||
* | | Change of tactic. Reverting this to the careminster version, then i'll ↵ | Tom | 2011-09-04 | 1 | -635/+1117 | |
| | | | | | | | | selectively merge the changes made to core. | |||||
* | | I fucked up the merge for SOG, so reverting back to OpenSim Core's version... | Tom | 2011-09-04 | 1 | -1005/+255 | |
| | | ||||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 42 | -1788/+2713 | |
|\ \ | |/ | ||||||
| * | Stop NPCs losing attachments when the source avatar takes them off. | Justin Clark-Casey (justincc) | 2011-09-03 | 3 | -7/+57 | |
| | | | | | | | | | | | | | | This was happening because we were using the source avatar's item IDs in the clone appearance. Switch to using the asset IDs of attachments instead for NPCs. The InventoryAccessModule and AttachmentModule had to be changed to allow rezzing of an object without an associated inventory item. Hopefully goes some way towards resolving http://opensimulator.org/mantis/view.php?id=5653 | |||||
| * | Comment out Scene.CleanDroppedAttachments() and calls. | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -36/+36 | |
| | | | | | | | | | | This method wasn't actually doing anything since dropped attachments retain a PCode of 9. Also, behaviour of dropped attachments in other places appears to be that they persist after avatar logout rather than get deleted. | |||||
| * | Go back to resetting the State parameter for all parts of a SOG when ↵ | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | SOG.ClearPartAttachmentData() is called. Even though we don't use these on rez they are still present after an unlink, after which selecting them causes various viewers to crash Hopefully really does address http://opensimulator.org/mantis/view.php?id=5664 | |||||
| * | stop passing FromUserInventoryItemID right down into the deserializer. | Justin Clark-Casey (justincc) | 2011-09-02 | 2 | -26/+5 | |
| | | | | | | | | the code becomes simpler if this is set from the outside - only one place needs to do this. | |||||
| * | Move more of IAM.RezObject() into DoPreRezWhenFromItem() | Justin Clark-Casey (justincc) | 2011-09-02 | 1 | -3/+2 | |
| | | ||||||
| * | refactor: use SOG register target waypoints and rots directly instead of ↵ | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -20/+0 | |
| | | | | | | | | calling through the SOP, which doesn't make conceptual sense anyway. | |||||
| * | Eliminate pointless checks of SOG.RootPart != null | Justin Clark-Casey (justincc) | 2011-09-01 | 4 | -139/+75 | |
| | | | | | | | | It's never possible for SOG to have no RootPart, except in the first few picosends of the big bang when it's pulled from region persistence or deserialized | |||||
| * | refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID() | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -17/+6 | |
| | | ||||||
| * | Fix issue with llGetTorque() where it would only ever return a zero vector. | Justin Clark-Casey (justincc) | 2011-09-01 | 1 | -9/+0 | |
| | | ||||||
| * | Remove pointless cluttering SOP.ParentGroup != null checks. | Justin Clark-Casey (justincc) | 2011-09-01 | 7 | -272/+185 | |
| | | | | | | | | | | The only times when ParentGroup might be null is during regression tests (which might not be a valid thing) and when scene objects are being constructed from the database. At all other times it's not possible for a SOP not to have a SOG parent. | |||||
| * | move common code into AttachmentsModule.DeleteAttachmentsFromScene() | Justin Clark-Casey (justincc) | 2011-08-31 | 3 | -15/+25 | |
| | | ||||||
| * | refactor: move multiple class to set avatar height into associated ↵ | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -16/+2 | |
| | | | | | | | | SP.AddToPhysicalScene() | |||||
| * | get rid of appearance null checks - this is never null | Justin Clark-Casey (justincc) | 2011-08-31 | 2 | -35/+16 | |
| | | ||||||
| * | remove pointless m_attachments == null check since this field is never null | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+1 | |
| | | ||||||
| * | minor: seal up another instance of using the appearance list without locking | Justin Clark-Casey (justincc) | 2011-08-31 | 1 | -1/+2 | |
| | | ||||||
| * | Make SP.Attachments available as sp.GetAttachments() instead. | Justin Clark-Casey (justincc) | 2011-08-31 | 2 | -15/+43 | |
| | | | | | | | | | | | | | | The approach here, as in other parts of OpenSim, is to return a copy of the list rather than the attachments list itself This prevents callers from forgetting to lock the list when they read it, as was happening in various parts of the codebase. It also improves liveness. This might improve attachment anomolies when performing region crossings. | |||||
| * | minor: remove already processed avatar null check in Scene.RemoveClient() | Justin Clark-Casey (justincc) | 2011-08-30 | 2 | -5/+1 | |
| | | | | | | | | remove some now duplicated method doc | |||||
| * | refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 4 | -26/+20 | |
| | | ||||||
| * | refactor: Move ScenePresence.RezAttachments() into AttachmentsModule | Justin Clark-Casey (justincc) | 2011-08-30 | 4 | -46/+64 | |
| | | | | | | | | This adds an incomplete IScenePresence to match ISceneEntity | |||||
| * | add Name property to ISceneEntity | Justin Clark-Casey (justincc) | 2011-08-30 | 1 | -2/+5 | |
| | | ||||||
| * | refactor: migrate DropObject handling fully into AttachmentsModule from Scene | Justin Clark-Casey (justincc) | 2011-08-30 | 3 | -13/+4 | |
| | | ||||||
| * | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-30 | 2 | -3/+20 | |
| |\ | ||||||
| | * | Fix bug in persisting saved appearances for npcs | Justin Clark-Casey (justincc) | 2011-08-30 | 2 | -3/+20 | |
| | | | | | | | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660 | |||||
| * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-29 | 9 | -93/+95 | |
| |\ \ | | |/ | ||||||
| | * | Related to #4689 - Adding missing null check for SceneObjectPart | Makopoppo | 2011-08-27 | 2 | -4/+18 | |
| | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | * | Stop avatars returning from neighbouring regions from stalling on the border ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -3/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | crossing. On making a root agent, we need to reset the ScenePresence.m_movement_flag so that it doesn't remember the movement registered to the client when it exited the initial region. If this is remember, then the client avatar movement isn't updated and it appears to stall in mid-air, though this is resolved with a prod/release of any other direction key. This bug was probably introduced a few weeks ago. Surprised that nobody brought it up. | |||||
| | * | Eliminate duplicate AttachmentPoint properties by always using the one ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 1 | -18/+18 | |
| | | | | | | | | | | | | stored in the root part's state field. | |||||
| | * | refactor: move SOP.IsAttachment and AttachmentPoint up into SOG to avoid ↵ | Justin Clark-Casey (justincc) | 2011-08-27 | 7 | -73/+42 | |
| | | | | | | | | | | | | pointless duplication of identical values | |||||
| * | | Merge branch 'master' into bulletsim | Mic Bowman | 2011-08-26 | 10 | -225/+180 | |
| |\ \ | | |/ | ||||||
| | * | refactor: simplify SOP.AttachedAvatar into SOG.AttachedAvatar | Justin Clark-Casey (justincc) | 2011-08-26 | 3 | -10/+14 | |
| | | | | | | | | | | | | This does a tiny bit to reduce code complexity, memory requirement and the cpu time of pointlessly setting this field to the same value in every SOP | |||||
| | * | refactor: move SOG.DetachToGround() to ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -40/+6 | |
| | | | | | | | | | | | | AttachmentsModule.DetachSceneObjectToGround() and remove redundant code | |||||
| | * | refactor: simplify DetachSingleAttachmentToGround() by retrieving the scene ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -2/+2 | |
| | | | | | | | | | | | | object group direct | |||||
| | * | refactor: move sog.DetachToInventoryPrep() into ↵ | Justin Clark-Casey (justincc) | 2011-08-26 | 1 | -28/+4 | |
| | | | | | | | | | | | | AttachmentsModule.DetachSingleAttachmentToInv() | |||||
| | * | remove pointless IsDeleted check on SP.RezAttachments() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -3/+0 | |
| | | | | | | | | | | | | | | | IsDeleted is never set for an SP, even though it's on EntityBase. It might be an idea to set it in the future | |||||
| | * | refactor: simplify EntityBase.IsDeleted property | Justin Clark-Casey (justincc) | 2011-08-24 | 3 | -10/+5 | |
| | | | ||||||
| | * | add SOG helper properties IsPhantom, IsTemporary, etc. to improve code ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -20/+46 | |
| | | | | | | | | | | | | | | | | | | readability use these in some sog methods | |||||
| | * | refactor: move Scene.Inventory.attachObjectAssetStore() into ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -84/+0 | |
| | | | | | | | | | | | | AttachmentsModule.AddSceneObjectAsAttachment() | |||||
| | * | get rid of pointless grp null check in attachObjectAssetStore() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -73/+69 | |
| | | | ||||||
| | * | minor: remove hardcoded region numbers with the region size constant and a ↵ | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | currently hardcoded offset | |||||
| | * | refactor: remove pointless AgentId argument from attachObjectAssetStore() | Justin Clark-Casey (justincc) | 2011-08-24 | 1 | -1/+1 | |
| | | |