Justin Clark-Casey (justincc)
75878c8f43
get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin
...
additional tweaks to get this working properly
2010-06-04 20:43:05 +01:00
Diva Canto
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
Diva Canto
952029380a
Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims.
2010-06-04 10:59:59 -07:00
Justin Clark-Casey (justincc)
bdeda18b52
Revert "commit code which stops full updates being fired multiple times when attachments cross standalone region boundaries"
...
This reverts commit 5074d290e4
.
This gets rid of the massive amount of scene object log spam - sorry about that, folks
2010-06-04 18:54:58 +01:00
Justin Clark-Casey (justincc)
86f2339b6e
remove estate stuff in sqlite region migrations since this also exists in estate migrations, change Sandbox to sandbox in sqlite region migrations
...
re-enabling the sqlite data tests revealed these errors!
2010-06-04 18:46:58 +01:00
Justin Clark-Casey (justincc)
5c322335e5
add sqlite database back to database tests
...
this appears to be okay even though we reuse it between runs without deleting it first.
size of the database appears not to be changing though that could be deceptive
2010-06-04 18:27:16 +01:00
Justin Clark-Casey (justincc)
041f253e2b
minor: comment out region interface registration log msg I accidentally left in last week
...
also changes one log message to print out full exception stack trace on both mono/.net instead of just .net
2010-06-04 18:08:40 +01:00
Justin Clark-Casey (justincc)
8eb70f9719
Fix bug where prim items were not loaded in the new sqlite database handler
...
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 18:02:30 +01:00
Justin Clark-Casey (justincc)
2f6d401db1
Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes
...
This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy
Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2010-06-04 18:00:48 +01:00
Justin Clark-Casey (justincc)
55040a84a5
Fix bug where prim items were not loaded in the new sqlite database handler
...
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 17:14:12 +01:00
Tom Grimshaw
dda7185b43
Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate
2010-06-03 17:55:50 -07:00
Melanie
82d0d1c092
Revert "Next OSG test. Don't remove app domains if they contain running threads."
...
This reverts commit f831a1778b
.
With this, post-fixes is back to normal.
2010-06-02 21:02:53 +01:00
Melanie
f831a1778b
Next OSG test. Don't remove app domains if they contain running threads.
2010-06-02 19:57:03 +01:00
Melanie
20e6b7a320
Next OSG test. Cowardly refuse to save the state of badly behaved scripts, instead of forcing the issue.
2010-06-02 18:05:58 +01:00
Melanie
c38f7c96e7
Revert "Next OSG TEST RELEASE. Join aborted threads."
...
This reverts commit 698066d7e3
.
2010-06-02 18:00:44 +01:00
Melanie
698066d7e3
Next OSG TEST RELEASE. Join aborted threads.
2010-06-02 17:41:28 +01:00
Melanie
c5cfae7bac
Revert "After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG"
...
This reverts commit 241ed5734e
.
2010-06-02 17:39:58 +01:00
Melanie
241ed5734e
After aborting a thread, wait for it to actually finish. EXPERIMENTAL for OSG
...
testing. DO NOT UPDATE TO THIS UNLESS YOU KNOW WHAT YOU'RE DOING!
2010-06-02 17:14:37 +01:00
Tom Grimshaw
293f775fa5
Always provide at least 2 packets of a texture (if the texture is larger than 1 packet). This fixes compatibility with the newer (broken) SnowGlobe and Emerald viewer(s), but also matches the behaviour of SL.
2010-06-02 07:59:18 -07:00
Melanie
b198763d67
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-02 01:22:10 +01:00
Melanie Thielker
aa5a346a68
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:21:55 +01:00
Melanie Thielker
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
Melanie Thielker
655f02b695
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-02 01:05:36 +02:00
Melanie Thielker
70aa965c26
Add a forgotten security check. Make the new functions only work on prims
...
owned by the host prim owner.
2010-06-02 01:04:17 +02:00
Melanie Thielker
d8962ef415
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:01:56 +02:00
John Hurliman
d740035ef4
Applying patch from coyled to fix IAR support with the SimianGrid connectors
2010-06-01 13:32:14 -07:00
Tom Grimshaw
90c814a7ca
Fix nullref in cmGetAvatarList() (ported from 0.69)
2010-06-01 13:29:12 -07:00
Tom Grimshaw
0209033dd9
Gosh, fixing another nullref issue in cmGetAvatarList. I deserve spanks.
2010-06-01 13:22:24 -07:00
Melanie Thielker
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
Melanie Thielker
6668c789d3
One should not lock null objects.
2010-06-01 19:01:21 +02:00
Melanie
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
Melanie Thielker
c900134f91
Lock the object queue when dequeueing
2010-06-01 16:03:53 +02:00
Melanie
5270e54268
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:20:39 +01:00
Melanie
f5ca701273
Comment and remove JScript support. Mono 2.7Dev and 2.8 no longer include the
...
needed libraries
2010-06-01 14:19:26 +01:00
Melanie
f8e2d25739
Merge branch 'master' into careminster-presence-refactor
2010-06-01 02:24:12 +01:00
Melanie Thielker
28c5759456
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-01 03:18:03 +02:00
Melanie Thielker
16d8602d3c
Fix prim returns I broke earlier
2010-06-01 03:17:21 +02:00
Melanie Thielker
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
Melanie Thielker
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
Melanie Thielker
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
Melanie Thielker
bde01e26e1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 02:10:11 +01:00
Melanie Thielker
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
Melanie Thielker
6c4c72546c
Fix prim returns I broke earlier
2010-06-01 03:05:08 +02:00
Melanie Thielker
eca15cfbf2
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 02:45:14 +02:00
Melanie Thielker
be69259981
Change the handling of CreateSelected. Only send it on real creation, not
...
for each prim coming into view.
2010-06-01 01:39:54 +01:00
Melanie Thielker
bf233ea0dc
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:27:30 +02:00
Melanie Thielker
f57f2370f1
Add a method to get the bounding box and root prim offsets within it for
...
a group of prims.
2010-06-01 01:25:24 +02:00
Melanie Thielker
70f7790413
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 01:07:46 +02:00
Melanie Thielker
9d4913224f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-31 19:00:36 +02:00
Melanie Thielker
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00