Commit Graph

12988 Commits (83fbf664448bfe9e7b13b907efbeee5c5e3f7b7d)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 83fbf66444 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-28 02:41:00 +01:00
Justin Clark-Casey (justincc) def6b1544f very minor log message and var name tweaking for iar saving 2010-08-28 02:40:21 +01:00
Diva Canto 0f95cd209e Addresses mantis #4991 -- HG between two regions with the same map coordinates fails with no warning 2010-08-27 17:25:04 -07:00
Justin Clark-Casey (justincc) 1c0b4457cd Improve liveness by operating on list copies of SOG.Children where appropriate 2010-08-28 00:40:33 +01:00
Justin Clark-Casey (justincc) 4f9931ec10 minor: reduce log chattiness of "load iar" for IARs with lots of folders 2010-08-27 23:23:55 +01:00
Justin Clark-Casey (justincc) 86937d0a0f allow inventory path specified in "load iar" to start with a / (e.g. /Objects is now valid where it wasn't before) 2010-08-27 23:22:49 +01:00
Justin Clark-Casey (justincc) b4278510f2 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-27 22:53:02 +01:00
Justin Clark-Casey (justincc) 8f875700ef refactor: Make IAR tests set up standard iar for loading 2010-08-27 22:52:26 +01:00
Diva Canto 0ca87a6f01 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2010-08-26 18:23:43 -07:00
Diva Canto 3c71e5a3a2 Deleted Check4096 from Robust.ini.example 2010-08-26 18:23:16 -07:00
Melanie 1f1d72eba5 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-08-26 23:39:20 +01:00
Melanie 5b4e0b72bc Send a null result search packet when no results are passsed in 2010-08-26 23:38:35 +01:00
Diva Canto 436fdc2ea8 More on mantis #4985 2010-08-26 14:48:29 -07:00
Diva Canto 6198fe53e6 Addresses mantis #4985 -- exceptions in DataSnapshot 2010-08-26 14:19:52 -07:00
Justin Clark-Casey (justincc) fb6d761e19 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-26 22:13:46 +01:00
Justin Clark-Casey (justincc) 7f5501d3ab minor: remove mono compiler warning 2010-08-26 22:13:31 +01:00
Justin Clark-Casey (justincc) 2b0f924557 refactor: Move Scene.Inventory.UpdateKnownItem() into Attachments module since this appears to relate solely to attachments 2010-08-26 22:09:52 +01:00
Justin Clark-Casey (justincc) f3f4428700 refactor: break out attachment position change code in Scene.UpdatePrimPosition() and move into AttachmentsModule
This allows region modules to change attachment positions.
2010-08-26 21:50:19 +01:00
Justin Clark-Casey (justincc) 8571a55d29 minor: change log message from info to debug 2010-08-26 20:42:56 +01:00
Diva Canto 26fd673e20 Addresses mantis #4984 -- Datasnapshot exceptions. 2010-08-26 12:26:09 -07:00
Justin Clark-Casey (justincc) fe660cd2cc Rename Newtonsoft.Json.dll to properly reflect its actual assembly name 2010-08-26 18:11:01 +01:00
Justin Clark-Casey (justincc) df702417dc Remove mono compiler warnings 2010-08-26 16:27:41 +01:00
Justin Clark-Casey (justincc) d99c60164d Reinstate kill record check that prevents an entity update being sent to a client after it has been told that the entity has been deleted.
On Linden Lab clients and some derivatives, receiving an entity update after an entity deletion notice results in an undeleteable prim that disappears upon client relog.
This check was dropped in 0.7 for unknown reasons but renewed testing demonstrates that queued updates can still be present after a scene object has been deleted.
2010-08-26 16:06:34 +01:00
Justin Clark-Casey (justincc) a6869fbc3e Use SOP.ParentGroup in Prioritizer instead of Scene.GetGroupByPrim()
By the time a scheduled update is triggered, a sog may have been removed from the scene.  This change prevents NullReferenceExceptions in these situations.
2010-08-26 15:33:42 +01:00
Justin Clark-Casey (justincc) 87a6554d4b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Resolve merge conflicts

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
2010-08-26 00:35:03 +01:00
Justin Clark-Casey (justincc) 692cf3c657 Remove parts locking from data classes since these are using a copy of the scene object 2010-08-26 00:17:26 +01:00
Justin Clark-Casey (justincc) 166ab59420 replace m_parts.Count linknum with 0 in CopyRootPart since m_parts.Count is always 0 (and any other number would cause an error anyway) 2010-08-26 00:15:26 +01:00
Justin Clark-Casey (justincc) 8031f8ec09 Improve consistency of locking for SOG.m_parts in order to avoid race conditions in linking and unlinking 2010-08-26 00:08:53 +01:00
Melanie Thielker 75e2a2b3ce Prevent an object disposed exception that made forms comms unreliable. After
starting an asynchronous write, one should not close the channel it will
be written to synchrnously, that leads to grief.
2010-08-25 23:19:55 +01:00
Melanie Thielker 604423d52b Make scene object directories more robust and prevent deleted SOP's from
sticking around
2010-08-25 23:19:30 +01:00
Melanie Thielker 739eb14741 Change some e.Message to e.ToString. Don't use e.Message, it doesn't carry
any useful information. Error messages are useless without location information.
It looks more elegant, but is totally pointless.
2010-08-25 23:18:15 +01:00
Justin Clark-Casey (justincc) 22fd00b002 minor: remove mono compiler warning 2010-08-25 23:07:43 +01:00
Justin Clark-Casey (justincc) 24d06b12c2 If setting SOG.UUID, update the SOG.m_parts index as well as the root part UUID
Being able to change a SOG.UUID is useful for region modules that want to supply their own UUID, before the object is rezzed
2010-08-25 23:05:54 +01:00
Justin Clark-Casey (justincc) 46c6c35d48 refactor: Push item retrieval and fixing part of Scene.RezObject() down into SceneObjectPartInventory 2010-08-25 22:46:49 +01:00
Diva Canto a2113ecc71 Typo 2010-08-24 21:01:37 -07:00
Justin Clark-Casey (justincc) d69e992665 Split out actual scene object insertion code from Scene.Inventory.RezObject 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
2010-08-24 23:25:19 +01:00
Justin Clark-Casey (justincc) 78f452050a Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-08-24 22:29:32 +01:00
Justin Clark-Casey (justincc) 07d5a0779a refactor: make RezObject() more readable 2010-08-24 20:53:25 +01:00
Marck a7a45cb22c Patch by Apelsin that fixes behaviour of llSetPos and llGetLocalPos for attachments.
This fixes Mantis #3923.

Signed-off-by: Melanie <melanie@t-data.com>
2010-08-24 19:19:26 +01:00
Justin Clark-Casey (justincc) 46d06b6c4c add test to check move of task item to user inventory when a target folder is explicitly given 2010-08-24 17:10:52 +01:00
Justin Clark-Casey (justincc) 8bb073d99a minor: stop test using obsolete property 2010-08-24 17:06:04 +01:00
Justin Clark-Casey (justincc) 35f719ae2f refactor TestMoveTaskInventoryItemNoParent() 2010-08-24 17:04:54 +01:00
Justin Clark-Casey (justincc) 289c21099c Add automated test at the opensim 'api' level to check that a given item goes to the correct directory
Also removes some mono compiler warnings
2010-08-24 16:50:31 +01:00
Melanie de85aabcbe Plumb the region type through to the ProductName field in estate messages 2010-08-24 12:41:21 +01:00
Justin Clark-Casey (justincc) c72d298202 Add system lookup folder fix to the RemoveXInventoryServiceConnector as well since this presumably suffers from the same problem. 2010-08-23 23:25:36 +01:00
Justin Clark-Casey (justincc) 1d01c91095 minor: some doc for the MoveTaskInventoryItem method in Scene.Inventory.cs 2010-08-23 23:21:44 +01:00
Justin Clark-Casey (justincc) 704a53fb9b Fix bug in llGiveInventory() where items were disappearing on relog
This was a regression - the code to look up the correct type folder was no longer being called if items were added without a parent folder set
This may have been broken since commit bd49985a on 2010-05-02
2010-08-23 23:16:48 +01:00
Justin Clark-Casey (justincc) 74e5fe5aa9 Remove various warnings and improve logging messages. No functional changes. 2010-08-23 22:24:23 +01:00
Melanie 8d8436e0ca Correct a minor typo 2010-08-21 20:59:25 +01:00
Melanie f445659dd3 Finally putting estate_settings.xml to rest. There will be no more attempts
to read or write this file.
2010-08-21 17:38:47 +01:00