Justin Clark-Casey (justincc)
c6ec573d10
Get rid of the confusing version of IAttachmentsModule.RezSingleAttachmentFromInventory() with the updateInventoryStatus switch, since this is never called with false
2011-09-06 00:36:38 +01:00
Justin Clark-Casey (justincc)
05a4bedc30
get rid of the unused AttachmentsModule.ShowAttachInUserInventory()
2011-09-06 00:32:52 +01:00
Justin Clark-Casey (justincc)
0cb0140a1d
Stop the pointless double setting of every attachment in AvatarAppearance.
...
The second was already being filtered out so this has no user level effect
2011-09-06 00:29:37 +01:00
Justin Clark-Casey (justincc)
cf73afec35
Try disabling the inconsistent attachment state check to see if this 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
2011-09-05 23:42:37 +01:00
Justin Clark-Casey (justincc)
5e579b71fd
Allow the HGInventoryBroker to set the UserManager when it instantiates a 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
2011-09-05 22:55:48 +01:00
Snoopy Pfeffer
9f75eaf50e
Fixed BulletSim config files for Linux *.so libraries.
2011-09-04 21:42:33 +02:00
Tom
9cc2d0b60a
Now merging the core changes.
2011-09-04 08:30:23 -07:00
Tom
af59352c4c
Change of tactic. Reverting this to the careminster version, then i'll selectively merge the changes made to core.
2011-09-04 07:54:17 -07:00
Tom
9ab951a954
I fucked up the merge for SOG, so reverting back to OpenSim Core's version...
2011-09-04 07:38:25 -07:00
Tom
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
5c1fa968ab
Stop NPCs losing attachments when the source avatar takes them off.
...
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
2011-09-03 01:11:16 +01:00
Justin Clark-Casey (justincc)
e6eb0d9a6f
Comment out Scene.CleanDroppedAttachments() and calls.
...
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.
2011-09-02 23:19:27 +01:00
Justin Clark-Casey (justincc)
dbcfb25a52
Remove redundant RootPart.CreatedSelected = true in IAM.RezObject() since this is done through parts iteration
2011-09-02 22:54:03 +01:00
Justin Clark-Casey (justincc)
26b471f25a
Go back to resetting the State parameter for all parts of a SOG when 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
2011-09-02 22:28:27 +01:00
Justin Clark-Casey (justincc)
af7c6c5f39
stop passing FromUserInventoryItemID right down into the deserializer.
...
the code becomes simpler if this is set from the outside - only one place needs to do this.
2011-09-02 00:50:16 +01:00
Justin Clark-Casey (justincc)
9c0a03731d
Move more of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:41:21 +01:00
Justin Clark-Casey (justincc)
15ea82e925
move more of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:25:05 +01:00
Justin Clark-Casey (justincc)
01146bb3e3
factor out a section of IAM.RezObject() into DoPreRezWhenFromItem()
2011-09-02 00:04:22 +01:00
Justin Clark-Casey (justincc)
3e86064d6b
refactor: factor out DoPostRezWhenFromItem() from IAM.RezObject()
2011-09-01 23:49:38 +01:00
Justin Clark-Casey (justincc)
cc8897127b
remove the pointless m_Scene.GetNewRezLocation() call at the top of IAM.RezObject() since its always recalculated later on anyway
2011-09-01 23:37:03 +01:00
Justin Clark-Casey (justincc)
712d44635a
refactor: Move sanity checks to the top of IAM.RezObject() to make the code more readable
2011-09-01 23:14:50 +01:00
Justin Clark-Casey (justincc)
e30651b931
use group.RootPart in IAM.RezObject() rather than group.GetChildPart(group.UUID);
2011-09-01 23:09:14 +01:00
Justin Clark-Casey (justincc)
8b83c4a433
Remove pointless NRE check in IAM.RezObject() since this can never occur
2011-09-01 23:06:57 +01:00
Justin Clark-Casey (justincc)
1bf29d60e1
Remove code which was automatically deleting non-root prims from scene 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
2011-09-01 22:05:05 +01:00
Justin Clark-Casey (justincc)
616e672fce
If the user receiving an inventory folder has left the scene by the time the acceptence message arrives, then don't send them an inventory update.
...
Doing so causes a NullReferenceException
2011-09-01 02:43:17 +01:00
Justin Clark-Casey (justincc)
c491cdcb95
refactor: use SOG register target waypoints and rots directly instead of calling through the SOP, which doesn't make conceptual sense anyway.
2011-09-01 02:18:31 +01:00
Justin Clark-Casey (justincc)
7eca929686
Eliminate pointless checks of SOG.RootPart != null
...
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
2011-09-01 02:11:00 +01:00
Justin Clark-Casey (justincc)
10d883dc88
refactor: use ParentGroup.UUID directly instead of SOP.GetRootPartUUID()
2011-09-01 01:41:53 +01:00
Justin Clark-Casey (justincc)
63bf710237
Fix issue with llGetTorque() where it would only ever return a zero vector.
2011-09-01 01:37:35 +01:00
Justin Clark-Casey (justincc)
095b3e5756
Remove pointless cluttering SOP.ParentGroup != null checks.
...
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.
2011-09-01 01:22:28 +01:00
Justin Clark-Casey (justincc)
083ba72b28
Fix a bug where the non-root parts of rezzed objects that had previously 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.
2011-08-31 23:33:01 +01:00
Justin Clark-Casey (justincc)
ca9a054bba
Don't set a GridUser entry for NPCs.
...
Resolves http://opensimulator.org/mantis/view.php?id=5665
2011-08-31 18:03:07 +01:00
Justin Clark-Casey (justincc)
7d58b5fa15
move common code into AttachmentsModule.DeleteAttachmentsFromScene()
2011-08-31 17:53:58 +01:00
Justin Clark-Casey (justincc)
3aa86d22d1
If a FireAndForget thread terminates with an exception, then catch and log 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)
2011-08-31 17:38:32 +01:00
Justin Clark-Casey (justincc)
e69f246b86
refactor: move multiple class to set avatar height into associated SP.AddToPhysicalScene()
2011-08-31 17:25:18 +01:00
Justin Clark-Casey (justincc)
899d109e82
get rid of appearance null checks - this is never null
2011-08-31 17:13:53 +01:00
Justin Clark-Casey (justincc)
8c703022c1
In WorldCommModule, replace the useless Attachments == null check with Attachments.Count == 0 instead
2011-08-31 16:50:18 +01:00
Justin Clark-Casey (justincc)
d3c03658aa
minor: remove mono compiler warning
2011-08-31 16:48:21 +01:00
Justin Clark-Casey (justincc)
54839d28ad
remove pointless m_attachments == null check since this field is never null
2011-08-31 16:46:43 +01:00
Justin Clark-Casey (justincc)
5a5206449f
minor: seal up another instance of using the appearance list without locking
2011-08-31 16:41:58 +01:00
Justin Clark-Casey (justincc)
32444d98cb
Make SP.Attachments available as sp.GetAttachments() instead.
...
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.
2011-08-31 16:29:51 +01:00
Justin Clark-Casey (justincc)
2acfff9f6d
remove pointless ToArray() call in AttachmentsModule.SaveChangedAttachments()
2011-08-30 23:39:26 +01:00
Justin Clark-Casey (justincc)
1809aaf74c
minor: remove already processed avatar null check in Scene.RemoveClient()
...
remove some now duplicated method doc
2011-08-30 23:36:45 +01:00
Justin Clark-Casey (justincc)
ddc733cd3d
refactor: move SP.SaveChangedAttachments() fully into AttachmentsModule
2011-08-30 23:32:30 +01:00
Justin Clark-Casey (justincc)
91f59f246f
also get "nant clean" to remove old .mdb from .exe and .dll
2011-08-30 23:20:54 +01:00
Justin Clark-Casey (justincc)
9e4153f16b
Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file
2011-08-30 23:17:02 +01:00
Justin Clark-Casey (justincc)
04bafd2122
refactor: Move ScenePresence.RezAttachments() into AttachmentsModule
...
This adds an incomplete IScenePresence to match ISceneEntity
2011-08-30 23:06:10 +01:00
Justin Clark-Casey (justincc)
a90e1cf3aa
add Name property to ISceneEntity
2011-08-30 22:39:16 +01:00
Justin Clark-Casey (justincc)
1de68b34d9
refactor: migrate DropObject handling fully into AttachmentsModule from Scene
2011-08-30 22:25:38 +01:00
Justin Clark-Casey (justincc)
37a5cf5783
minor: comment out friends number logging from login for now
2011-08-30 22:08:43 +01:00