aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | When a region is added to the HG Inventory Broker, also pass this through to ↵Justin Clark-Casey (justincc)2011-09-073-21/+41
| | | | | | | | | | | | | | | | | | | | | | | | the embedded local inventory connector to prevent an NRE when that connector tries to lookup the UserManager through the scene. This is to address http://opensimulator.org/mantis/view.php?id=5669 However, if this failure was happening I'm kind of surprised that local HG inventory was working at all..... We probably weren't seeing these exceptions previously because we weren't logging them when the reached the top of a FireAndForget thread.
| * | Add temporary debugging in HGInventoryBroker and ↵Justin Clark-Casey (justincc)2011-09-063-19/+33
| | | | | | | | | | | | | | | | | | | | | RemoveXInventoryServiceConnector This is for http://opensimulator.org/mantis/view.php?id=5669 If we can't retrieve an IUserManagement module we complain, and we also warn in the log when its manually set in XISC by HGInventoryBroker
| * | Lock m_pendingObjects when calling GetPendingObjectsCount().Justin Clark-Casey (justincc)2011-09-061-1/+2
| | | | | | | | | | | | | | | | | | This is only called by a region console command. We should also be locking m_partsUpdateQueue when dequeueing the next part, or locking m_pendingObjects in QueuePartForUpdate(). However, I won't do this now since I don't have time to analyze how this would affect liveness.
| * | Comment out SceneViewer.Reset() and stop calling from Close() since this is ↵Justin Clark-Casey (justincc)2011-09-061-16/+17
| | | | | | | | | | | | | | | | | | useless work as a closed scene object is never reset. Strictly speaking, we could also stop bothering to clear the m_updateTimes and m_partsUpdateQueue if we are sure that the whole SceneViewer is shortly to be garbage collected anyway, but we'll leave them around for now.
| * | Comment out unused ISceneViewer.Reset() to reduce code complexityJustin Clark-Casey (justincc)2011-09-061-1/+1
| | |
| * | In SceneViewer, introduce an IsEnabled flag and perform Close() under an ↵Justin Clark-Casey (justincc)2011-09-062-19/+51
| | | | | | | | | | | | m_pendingObjects lock in order to avoid the race condition seen by danbanner in http://opensimulator.org/mantis/view.php?id=5669
| * | refactor: Make logic in AM.AttachObject() clearer by not reusing existing ↵Justin Clark-Casey (justincc)2011-09-061-14/+19
| | | | | | | | | | | | variables in different contexts
| * | rename AM.AddSceneObjectAsAttachment() to AddSceneObjectAsNewAttachmentInInvJustin Clark-Casey (justincc)2011-09-061-3/+3
| | |
| * | In SetAttachment, if the existing attachment has no asset id then carry on ↵Justin Clark-Casey (justincc)2011-09-064-6/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than abort. When a user logs in, the attachment item ids are pulled from persistence in the Avatars table. However, the asset ids are not saved. When the avatar enters a simulator the attachments are set again. If we simply perform an item check then the asset ids (which are now present) are never set, and NPC attachments later fail unless the attachment is detached and reattached. Hopefully resolves part of http://opensimulator.org/mantis/view.php?id=5653
| * | Get rid of the confusing version of ↵Justin Clark-Casey (justincc)2011-09-062-25/+2
| | | | | | | | | | | | IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
| * | get rid of the unused AttachmentsModule.ShowAttachInUserInventory()Justin Clark-Casey (justincc)2011-09-061-28/+0
| | |
| * | Stop the pointless double setting of every attachment in AvatarAppearance.Justin Clark-Casey (justincc)2011-09-063-10/+13
| | | | | | | | | | | | The second was already being filtered out so this has no user level effect
| * | Try disabling the inconsistent attachment state check to see if this ↵Justin Clark-Casey (justincc)2011-09-053-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Allow the HGInventoryBroker to set the UserManager when it instantiates a ↵Justin Clark-Casey (justincc)2011-09-052-3/+15
| | | | | | | | | | | | | | | | | | | | | RemoteXInventoryServiceConnector for a visiting HG user. Not doing this causes NREs whenever that user tries to access inventory when Hypergrid is turned on since the Remote connector does not have a scene (which is only used to fetch the UserManager) Aims to address http://opensimulator.org/mantis/view.php?id=5669
* | | Merge fixes, and fix the buildTom2011-09-1410-348/+178
| | |
* | | First set of merge fixesTom2011-09-0711-585/+337
| | |
* | | Now merging the core changes.Tom2011-09-041-421/+444
| | |
* | | Change of tactic. Reverting this to the careminster version, then i'll ↵Tom2011-09-041-635/+1117
| | | | | | | | | | | | selectively merge the changes made to core.
* | | I fucked up the merge for SOG, so reverting back to OpenSim Core's version...Tom2011-09-041-1005/+255
| | |
* | | Resolve merge commits, stage 1Tom2011-09-04234-4823/+18749
|\ \ \ | |/ / | | / | |/ |/|
| * Stop NPCs losing attachments when the source avatar takes them off.Justin Clark-Casey (justincc)2011-09-037-70/+154
| | | | | | | | | | | | | | 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-022-37/+37
| | | | | | | | | | 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.
| * Remove redundant RootPart.CreatedSelected = true in IAM.RezObject() since ↵Justin Clark-Casey (justincc)2011-09-021-2/+0
| | | | | | | | this is done through parts iteration
| * Go back to resetting the State parameter for all parts of a SOG when ↵Justin Clark-Casey (justincc)2011-09-022-5/+14
| | | | | | | | | | | | | | 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-023-30/+7
| | | | | | | | 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-022-27/+29
| |
| * move more of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-63/+85
| |
| * factor out a section of IAM.RezObject() into DoPreRezWhenFromItem()Justin Clark-Casey (justincc)2011-09-021-40/+48
| |
| * refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()Justin Clark-Casey (justincc)2011-09-011-3/+8
| |
| * remove the pointless m_Scene.GetNewRezLocation() call at the top of ↵Justin Clark-Casey (justincc)2011-09-011-7/+4
| | | | | | | | IAM.RezObject() since its always recalculated later on anyway
| * refactor: Move sanity checks to the top of IAM.RezObject() to make the code ↵Justin Clark-Casey (justincc)2011-09-011-219/+215
| | | | | | | | more readable
| * use group.RootPart in IAM.RezObject() rather than ↵Justin Clark-Casey (justincc)2011-09-011-1/+1
| | | | | | | | group.GetChildPart(group.UUID);
| * Remove pointless NRE check in IAM.RezObject() since this can never occurJustin Clark-Casey (justincc)2011-09-011-15/+1
| |
| * Remove code which was automatically deleting non-root prims from scene ↵Justin Clark-Casey (justincc)2011-09-013-32/+4
| | | | | | | | | | | | | | objects that had previous been attachments. Looks like this code was accidentally uncommented in e1b5c612 from feb 2010. Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664
| * If the user receiving an inventory folder has left the scene by the time the ↵Justin Clark-Casey (justincc)2011-09-011-5/+4
| | | | | | | | | | | | acceptence message arrives, then don't send them an inventory update. Doing so causes a NullReferenceException
| * refactor: use SOG register target waypoints and rots directly instead of ↵Justin Clark-Casey (justincc)2011-09-012-24/+6
| | | | | | | | calling through the SOP, which doesn't make conceptual sense anyway.
| * Eliminate pointless checks of SOG.RootPart != nullJustin Clark-Casey (justincc)2011-09-0112-205/+119
| | | | | | | | 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-011-17/+6
| |
| * Fix issue with llGetTorque() where it would only ever return a zero vector.Justin Clark-Casey (justincc)2011-09-012-10/+1
| |
| * Remove pointless cluttering SOP.ParentGroup != null checks.Justin Clark-Casey (justincc)2011-09-0116-424/+274
| | | | | | | | | | 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.
| * Fix a bug where the non-root parts of rezzed objects that had previously ↵Justin Clark-Casey (justincc)2011-08-311-1/+12
| | | | | | | | | | | | | | | | | | been attachments were sending their old attachment values to the client. The root part state is the canonical value, so always send that instead. Sending conflicting attachments states for non-root parts of a rezzed object is enough to crash the client. Fixes http://opensimulator.org/mantis/view.php?id=5664. Many thanks to mewtwo0641 for some fantastic qa work on this one.
| * Don't set a GridUser entry for NPCs.Justin Clark-Casey (justincc)2011-08-311-1/+4
| | | | | | | | Resolves http://opensimulator.org/mantis/view.php?id=5665
| * move common code into AttachmentsModule.DeleteAttachmentsFromScene()Justin Clark-Casey (justincc)2011-08-316-25/+37
| |
| * If a FireAndForget thread terminates with an exception, then catch and log ↵Justin Clark-Casey (justincc)2011-08-311-1/+15
| | | | | | | | | | | | rather than letting it terminate the simulator. Exceptions don't appear to do this with the SmartThreadPool but they do with UnsafeQueueUserWorkItem (and maybe others)
| * refactor: move multiple class to set avatar height into associated ↵Justin Clark-Casey (justincc)2011-08-312-17/+3
| | | | | | | | SP.AddToPhysicalScene()
| * get rid of appearance null checks - this is never nullJustin Clark-Casey (justincc)2011-08-313-35/+17
| |
| * In WorldCommModule, replace the useless Attachments == null check with ↵Justin Clark-Casey (justincc)2011-08-311-2/+1
| | | | | | | | Attachments.Count == 0 instead
| * minor: remove mono compiler warningJustin Clark-Casey (justincc)2011-08-311-1/+1
| |
| * remove pointless m_attachments == null check since this field is never nullJustin Clark-Casey (justincc)2011-08-311-1/+1
| |
| * minor: seal up another instance of using the appearance list without lockingJustin Clark-Casey (justincc)2011-08-312-2/+3
| |
generated by cgit v1.1 at 2024-12-19 07:35:48 +0000