Commit Graph

14095 Commits (d299f8b55cb0e3848dbcbb941a5789d52459bc44)

Author SHA1 Message Date
Melanie Thielker 8ab4b277c1 Fix some issues with unlinking 2010-09-07 17:12:28 +02:00
Melanie 2684ca0838 Merge branch 'master' into careminster-presence-refactor 2010-09-07 11:51:26 +01:00
Melanie 8fda08d858 Make sure unlinked child prims get persisted 2010-09-07 11:48:28 +01:00
Justin Clark-Casey (justincc) f7b28dd321 If a scene object part UUID is changed (only possible when not in a scene), then adjust the inventory items to point to the new uuid as well 2010-09-07 03:41:29 +01:00
Justin Clark-Casey (justincc) 84ad9e4d4e minor: comment out some excessive test logging 2010-09-07 02:05:44 +01:00
Justin Clark-Casey (justincc) 90cd035693 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-07 02:01:38 +01:00
Melanie 3284356bba Merge branch 'master' into careminster-presence-refactor 2010-09-07 01:48:00 +01:00
Melanie 99bfb0d2a2 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-09-07 01:45:08 +01:00
Justin Clark-Casey (justincc) 3d033520fa Fix deletion persistence when freshly delinked prims are removed
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is not required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.

Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:43:20 +01:00
Justin Clark-Casey (justincc) 11f4a65f42 Fix deletion persistence when freshly delinked prims are removed
Previously, Scene.Inventory.DeRezObjects() forced the persistence of prims before deletion.
This is necessary so that freshly delinked prims can be deleted (otherwise they remain as parts of their old group and reappear on server restart).
However, DeRezObjects() deleted to user inventory, which is required by llDie() or direct region module unlink and deletion.
Therefore, forced persistence has been pushed down into Scene.UnlinkSceneObject() to be more general, this is still on the DeRezObjects() path.

Uncommented TestDelinkPersistence() since this now passes.
Tests required considerable elaboration of MockRegionDataPlugin to reflect underlying storing of parts.
2010-09-07 01:12:06 +01:00
Justin Clark-Casey (justincc) e55f6d47e9 Add test that checks correct persistence when an unlink is quickly followed by deletion of a linked part
This test is temporarily not running since it currently fails due to a bug in this area
2010-09-06 23:28:52 +01:00
Justin Clark-Casey (justincc) ab875b32c1 Make console backup command do a forced backup rather than non-forced
Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
2010-09-06 23:12:03 +01:00
Justin Clark-Casey (justincc) 537fefa3f2 extend TestNewSceneObjectLinkPersistence() to check for presence of non-root linked prim 2010-09-06 23:06:23 +01:00
Justin Clark-Casey (justincc) 953b7f4917 Add test to check persistence of newly added pre-linked objects
Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate
NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup.  Adding an in-memory store here would be unecessary overhead.
2010-09-06 23:00:24 +01:00
Kitto Flora cfaefad754 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-09-06 21:45:17 +00:00
Kitto Flora c719e016ed Falling animation fix, comment out instrumentation. 2010-09-06 21:45:07 +00:00
Melanie Thielker 36cb6208b5 Fix yet another cause of "Ghost attachments" 2010-09-06 22:08:15 +01:00
Melanie Thielker 8886afd319 Fix yet another cause of "Ghost attachments" 2010-09-06 21:59:52 +02:00
Melanie Thielker f4f9a2cb45 Don't turn off the sale settings on child prims when linking, and on copy
of prims anymore. The behavior now matches SL and can be used to link
vendor prims for transport
2010-09-06 18:14:24 +02:00
Melanie Thielker 06adbc1324 Revert "Workaround for mono bug #312968"
This reverts commit f2e343d530.

Doesn't compile with our version of Mono. Patched Mono instead.
2010-09-06 17:24:10 +02:00
Melanie Thielker f2e343d530 Workaround for mono bug #312968 2010-09-06 14:09:46 +02:00
Melanie Thielker 0246edc2ea Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 04:09:51 +01:00
Melanie Thielker 00a23eea0e Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because
modules need to see it (Search!) even if it comes in via CAPS
2010-09-06 03:59:48 +02:00
Melanie b9c20fbaa7 Merge branch 'master' into careminster-presence-refactor 2010-09-05 19:15:49 +01:00
Melanie 7f9f9f9246 Fix a handful of copypaste errors 2010-09-05 19:14:45 +01:00
Melanie 1b770d3afc Change UserAccountService to match 2010-09-05 19:09:30 +01:00
Melanie 4243701d22 Make Simian profiles respect the module chosen in [Profile] 2010-09-05 19:06:50 +01:00
Melanie 55d3c98917 Fix up presence connector in SimianGrid 2010-09-05 18:24:16 +01:00
Melanie 0ca48b2486 Fix up Simian inentory 2010-09-05 18:14:31 +01:00
Melanie b2486df67c Friends works differently, it' snot even a region module at all, but a connector
that is loaded by the core friends module. Change Simian to match.
2010-09-05 18:06:42 +01:00
Melanie 1238b27d64 And the avatar services :) 2010-09-05 17:53:15 +01:00
Melanie a407ad38f6 Add the m_Enabled pattern to Simian Auth 2010-09-05 17:44:02 +01:00
Melanie d9e9c41e13 Add m_Enabled pattern to SimianGridConnector 2010-09-05 17:34:51 +01:00
Melanie 4025b85a07 As an exmple, add the code to disable connectors intot he simian asset
connector
2010-09-05 17:24:05 +01:00
Melanie 64ec14c8c4 Add missing IDwellModule interface 2010-09-05 17:08:57 +01:00
Melanie 09c75b30f3 Fix build break 2010-09-05 16:45:24 +01:00
Melanie e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Melanie Thielker 6a0a878f7c Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
2010-09-05 14:28:33 +01:00
Melanie Thielker e593607171 Remove "Dwell" support from core and replace it with calls to methods
on IDwellModule
2010-09-05 14:16:42 +02:00
Diva Canto 68f107b27e Logout the presence if client IP verification fails. 2010-09-04 18:46:27 -07:00
Diva Canto 953a487f5e One more debug message to track an issue on Danger grid. 2010-09-04 18:09:17 -07:00
Diva Canto 9fd9836841 Make User Agent Service and Login Service separable. 2010-09-04 16:39:03 -07:00
BlueWall 1e44ec84bd Build system upgrade:
Upgrading Prebuild.exe to correctly construct build solutions
	for crossplatform tools such as xbuild, monodevelop and nant.

	NOTE: Module prebuild files will need modification to work,
	as the prebuild must correctly define the reference path for
	all assemblies shipped in the OpenSimulator ./bin directory.
	These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
	Nini.dll, etc. . The entries should follow the form:

		<Reference name="Nini" path="../../../bin/"/>

	See the distributed prebuild.xml for further examples.

	Crossplatform tools: xbuild and monodevelop use the
	vs2008 OpenSim.sln and the .csproj files in each namespace.

	Changes to the Prebuild.exe are against svn 322 and are included
	in a patch attached to the mantis. And the dnpb source are
	available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
	The patches are pending application by the dnpb team. After which,
	the un-modified upstream Prebuild.exe will work as expected.
2010-09-04 02:12:21 +01:00
Justin Clark-Casey (justincc) c0b16f09bf Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-04 01:38:11 +01:00
Justin Clark-Casey (justincc) 1e8e98a07f Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs
This fixes the problem for all architectures (hg as well as local and grid) and means we don't have to dupe code between connectors.
Not ideal in that it becomes non-modular, but methods in Scene.Inventory.cs should eventually be modularized anyway.
2010-09-04 01:36:26 +01:00
Diva Canto 8fc68c6d98 Added XFF header processing. Untested, for lack of proxy. 2010-09-03 17:18:53 -07:00
Justin Clark-Casey (justincc) 107052b23d Create Scene.Inventory.cs.AddInventoryItem(InventoryItemBase item)
The agentID in AddInventoryItem(UUID agentID, InventoryItemBase item) is redundant since it's contained in item.Owner, and it doesn't make sense for agentID != item.Owner, hence the method is deprecated.
2010-09-04 00:09:53 +01:00
Justin Clark-Casey (justincc) d4b572d2a5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 23:29:59 +01:00
Justin Clark-Casey (justincc) 63617c79d8 minor: remove mono compiler warnings 2010-09-03 23:29:39 +01:00
John Hurliman 1e552e88e8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-09-03 14:50:42 -07:00