Melanie Thielker
319007783c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-08 00:50:31 +02:00
Melanie Thielker
7a1b1dd419
Make AddRestoredSceneObject reset the IsDeleted flag so we can take an
...
object out of the scene and then put it back in.
2010-09-08 00:49:32 +02:00
John Hurliman
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
John Hurliman
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
John Hurliman
587bab79b4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-07 13:43:52 -07:00
John Hurliman
029c954804
* Added sanity checks to the SimianAssetServiceConnector so it will throw a sensible error message when it is misconfigured instead of a mysterious "Uri is empty" error
2010-09-07 13:43:36 -07:00
Melanie
b28d1b6ccd
Fix Simian regression
2010-09-07 20:21:05 +01:00
Melanie
342c64b7ac
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-07 20:20:16 +01:00
Melanie
50cc22c9e6
Fix Simian regression
2010-09-07 20:19:52 +01:00
John Hurliman
5ca4c238e0
SimianUserAccountServiceConnector was not initializing the user cache
2010-09-07 11:33:46 -07:00
John Hurliman
910aa48df3
Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify services in the way the ROBUST loader expects them (hopefully!)
2010-09-07 11:13:37 -07:00
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