fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
9b30f44672
D.U.H. #2 . Inverted test. Again. Argh!
2010-06-14 02:28:31 +02:00
1532dbca0a
Guard against a potential nullref
2010-06-14 00:12:39 +02:00
f9b4f5f594
Revert "Introduce SOP.UpdateSitters() to update sitting avatars' chat position if"
...
This reverts commit f59e272643
2010-06-14 00:05:01 +02:00
5fda89fdb5
Revert "D.U.H."
...
This reverts commit 3058761806
2010-06-14 00:04:02 +02:00
093cc047cd
Revert "Try it witht he root prim"
...
This reverts commit d520360cb8
2010-06-14 00:03:43 +02:00
62763cc0fb
Report current position instead of position at the time we sat down
2010-06-14 00:02:17 +02:00
d520360cb8
Try it witht he root prim
2010-06-13 23:01:15 +02:00
9069114d0f
Fox my changes to radmin
2010-06-13 21:57:56 +01:00
14c587bea1
Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following
...
changes:
- Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it
- Adjusted comments to remove misleading or no longer true comments. Default
is neuter, according to the code, not male, as the comment stated.
2010-06-13 21:45:39 +01:00
3058761806
D.U.H.
...
un-reverse a reversed condition
2010-06-13 22:43:14 +02:00
520b0e131c
Try to make prims stop moving. Reset velocity, etc, unconditionally. Although
...
the phys actor may be new, the prim fields could still be set and the
slimupdates system would continue sending that data out.
2010-06-13 22:37:11 +02:00
3d319d6c3f
Actually update the SP. EXPERIMENTAL
2010-06-13 22:23:07 +02:00
f59e272643
Introduce SOP.UpdateSitters() to update sitting avatars' chat position if
...
needed
2010-06-13 22:21:05 +02:00
deaf6bff98
Merge branch 'master' into 0.7-post-fixes
2010-06-13 03:56:47 +01:00
b3594681a4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 12:09:06 -07:00
66619b5996
Added checks for failed UpdateAgent calls.
2010-06-12 12:08:45 -07:00
5e4bee0f34
Merge branch 'master' into careminster-presence-refactor
2010-06-12 19:15:59 +01:00
59acb37d92
Change name of method to better reflect what it does
2010-06-12 19:14:46 +01:00
b9c01a1c42
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-12 11:11:48 -07:00
e6efe34b4c
* Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
...
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
4950ee5f3b
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 16:27:55 +01:00
d2342319da
Merge branch 'master' into careminster-presence-refactor
2010-06-12 16:27:37 +01:00
ceac35bac1
Log and eat sculpt meshing exceptions caused by bad jp2 data.
2010-06-12 16:25:40 +01:00
63531b1df5
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-12 04:36:14 -07:00
3ea11fe2e6
Get rid of spamming SOG debug message
2010-06-12 04:35:51 -07:00
3c036934a3
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:28:00 +01:00
4c58ac2c90
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:35:03 +01:00
65f03af38f
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 07:34:55 +01:00
03a48f87e4
Preserving the link numbers is a serializer's highest duty.
...
Prevent region crossings from screwing up complex attachments by preserving
link numbers.
2010-06-12 08:29:20 +02:00
e337c9130f
Make local teleports send CHANGED_TELEPORT
2010-06-12 07:34:22 +02:00
57a60282f5
Don't filre CHANGED_INVENTORY if a prim comes in from storage
2010-06-12 06:57:10 +01:00
0ece71f8d1
Merge branch 'master' into careminster-presence-refactor
2010-06-12 06:14:10 +01:00
92fea025cb
Resume scripts that have been rezzed from a prim
2010-06-12 06:13:27 +01:00
3c3ad08868
Merge branch 'master' into careminster-presence-refactor
...
0.7.1CM Dev
2010-06-12 02:46:11 +01:00
85d2e21558
Change trunk versio to 0.7.1 Dev
2010-06-12 02:45:21 +01:00
99f2a1c347
* Tweak the StopFlying() method in LLClientView to fabricate a suitable landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
2010-06-11 21:46:01 -04:00
4dd9cf1ce4
Change flavor to 0.7-RC1
2010-06-12 02:44:01 +01:00
ae0a7e2c37
Merge branch 'master' into careminster-presence-refactor
2010-06-12 02:19:57 +01:00
508bfa1de8
Merge branch 'master' into careminster-presence-refactor
2010-06-12 01:26:55 +01:00
c8ed972443
Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet
...
we used to send before slimupdates and explicitly send it
2010-06-12 01:25:25 +01:00
6a2e0c707c
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:34:26 +01:00
ed38b4a140
Some people don't use Simian. Make the connector respect that it's disabled
...
and not try to send a map tile in that case.
2010-06-12 00:32:54 +01:00
836728e5de
Merge branch 'master' into careminster-presence-refactor
2010-06-12 00:08:20 +01:00
b5bc2816fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 15:43:22 -07:00
d1a324888b
* Added a new method to IMapImageGenerator for getting the map tile before it is JPEG2000 compressed
...
* Aesthetically improved map tile water
* SimianGrid connector now uploads a PNG tile to the AddMapTile API
2010-06-11 15:37:25 -07:00
c61e998580
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-11 22:09:24 +01:00
0dce4f1997
Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)"
...
This reverts commit 3525195bc9
2010-06-11 22:13:36 +01:00
694c8ab588
Remove the lastmap stuff from the map module, also remove a bunch of comments
...
that no longer reflect actual conditions
2010-06-11 22:08:43 +01:00
3525195bc9
Allow IInventoryService.GetFolder(folderId, userId) as well as GetFolder(InventoryFolderBase folder)
...
This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood.
This is in line with other methods that alraedy allow requests via uuid
2010-06-11 21:55:18 +01:00
8531da37d4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-11 21:18:53 +01:00
1a16a92a62
create inactive test for iar folders/items merged with existing paths
...
add various helper functions for simplifying test readability
2010-06-11 21:18:09 +01:00
5d099182c3
Reinstated the check on im.binaryBucket.Length, this time on the local handler for inventory offers.
2010-06-11 13:14:07 -07:00
4e34770aba
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:56:43 +01:00
556e91d33c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-11 12:48:06 -07:00
d184fef4dc
Inventory offers and subsequent notifications of acceptance/decline now working across the board.
2010-06-11 12:47:47 -07:00
1cfebca48d
Merge branch 'master' into careminster-presence-refactor
2010-06-11 20:35:00 +01:00
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01:00
7c4cf46bac
Rename CM files to LS
2010-06-11 17:42:41 +01:00
ad87bab271
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:30:23 +01:00
b64f42fa41
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:03:45 +01:00
be71a2e5bc
Revert "Remove the cm* function namespace"
...
This reverts commit ef93ac4452
2010-06-11 17:52:19 +02:00
b1224c3540
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:47:34 +01:00
aa2f5bdd77
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:46:29 +01:00
ef93ac4452
Remove the cm* function namespace
2010-06-11 17:48:33 +02:00
10ef80cf15
Rename CM files to LS
2010-06-11 17:42:16 +02:00
97d83c87ec
Rename cm* function set to ls* (for LightShare)
2010-06-11 17:23:06 +02:00
8d5cec5e0d
Remove cmGetAvatarList()
2010-06-11 17:08:18 +02:00
b3cf5ccf6d
Clone cmGetAvatarList into osGetAvatarList for more generic use.
2010-06-11 17:04:54 +02:00
7f349d61cb
Better friends notification: get rid of OnLogout and use OnClientClose for sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
2010-06-11 06:32:24 -07:00
2e1269e4ca
Bug fix on friends notifications. OnClientClose and OnLogout ordering are unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
2010-06-10 21:59:12 -07:00
b2b6799f1c
Added more debug messages to try to pinpoint where login is failing for nebadon.
2010-06-10 18:26:04 -07:00
e80cb815df
Bug fix on attachments: attach->drop->attach works now.
2010-06-09 12:51:24 -07:00
1dce243661
Merge branch 'master' into careminster-presence-refactor
2010-06-09 20:25:05 +01:00
2a71df1285
Reverting that last permissions check upon drop. Looks like all dropped attachments are deleted from inventory.
2010-06-09 12:22:25 -07:00
18bfe58de8
Bug fix on attachments: don't delete the item from inventory when it's dropped on the ground.
2010-06-09 11:24:37 -07:00
8fc5eda2c9
Bug fix in attachments: when attaching from inworld the item's parentFolderID was wrong.
2010-06-09 10:55:37 -07:00
1be53b58a7
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:02:01 +01:00
30d3ea3d4b
Give attachments the same priority as other avatars in BestAvatarResponsiveness
...
policy
2010-06-09 17:00:24 +01:00
6b2d2413f7
Merge branch 'master' into careminster-presence-refactor
2010-06-09 16:48:37 +01:00
008e840cf2
Add the BEGIN; I had missed
2010-06-09 16:37:20 +01:00
668c3b4062
Re-add Migration version 32, which apparently got dropped completely.
2010-06-09 16:34:18 +01:00
796e9b5cb4
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-09 03:52:24 +01:00
16439fa354
If a script is deleted before it gets compiled, don't even bother to try
...
compiling it
2010-06-09 03:51:43 +01:00
ca2abc43ad
Refactor SendCoarseLocations for better performance. Instead of computing list of all locations fresh for every scene presence on every frame, we will instead compute the list once every 50 frames and send to all connected presences at that time. Also, we only add 60 items to the list when there are more than 60 presences in the scene. For 1000 users, this change yields a 99.8% reduction in list processing and a 98% reduction in network bandwidth for coarse locations.
2010-06-08 16:44:18 -07:00
0520b62955
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-08 15:52:56 -07:00
5c0068723f
Changed XInventoryData's CreatorID to a string.
2010-06-08 15:52:26 -07:00
9b9804a498
* Changed CreatorIDs consistently to varchar(128)
...
* Deleted redundant migration for assets in SQLite
* Rewrote XInventory migrations in SQLite in the new style
2010-06-08 15:47:14 -07:00
20ea823c19
Merge branch 'master' into careminster-presence-refactor
2010-06-08 22:07:01 +01:00
933bfd17f7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-08 22:05:49 +01:00
a791689ceb
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
7d75dc1294
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 22:04:09 +02:00
54209907f3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-08 16:15:45 -04:00
6e2cc98eac
Fixed llMoveToTarget() and Rotation Lock/Enable (ChODE/ODEPrim only)
2010-06-08 16:15:16 -04:00
4921d5ac2d
Make the text mode remote console really work. It can now be used to send
...
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:03:08 +02:00
24c36f26d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-08 20:07:50 +01:00
21246395be
Comment out the attachment update reordering mechanism in LLClientView since this doesn't appear necessary when the prim priorities are adjusted so that root prim updates are always sent before child prim updates.
2010-06-08 15:38:53 +01:00
db73b1c64e
Adjust object update priorities such that root prims are sent to the viewer before child prims.
...
This was originally a fix for huds, since child prims fail to display if the viewer doesn't receive the root prim update first.
However, on the advice of jhurliman, this has been done for all objects, both ordinary and attachments.
The separate mechanism in LLClientView which prevents child prim updates being sent out first is still present temporarily.
This is a foreport of the equivalent fix in 0.6.9-post-fixes, though that was for attachments only.
2010-06-08 15:32:18 +01:00
b6076d7b33
Reduce number of full updates sent on region crossing for attachments/huds to 1 from 3
...
This is one step towards reducing hud glitches on region crossing, since the viewer fails to display prims if it receives child full updates before the root prim full update
This commit also introduces a mechanism in LLClientView to stop child attachment updates ever going out before the root one
This is a very temporary mechanism and will be commented out when the next step of the fix (to give root prims higher udpate priority) is committed
This code is a foreport from the equivalent changes in 0.6.9-post-fixes
2010-06-08 15:07:57 +01:00
d2dfbbe339
Merge branch 'master' into careminster-presence-refactor
2010-06-08 00:44:53 +01:00
a246cbce8d
Add a migration to adjust types in the WL table. The new connector likes that
...
better
2010-06-08 00:37:38 +01:00
74d62901c8
Merge branch 'master' into careminster-presence-refactor
2010-06-07 00:44:36 +01:00
d91bd7646d
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:11:30 +01:00
fad5158ab4
Add a call to SOG.ResumeScripts() after region crossing / teleport
2010-06-07 00:09:44 +02:00
ab3afd5f42
* Bug fix in TP home: typo in unpacking of GridUserInfo.
...
* Bug fix in TPs across neighboring regions: bug was introduced when getting rid of crashed sessions.
2010-06-05 09:39:09 -07:00
fe3e1c67ae
Bug fix: update the list of friends upon MakeRoot, because child agents don't get notified of new friendships.
2010-06-05 06:56:36 -07:00
e962c44749
Fix support for PRIM_SCULPT_FLAG_INVERT and PRIM_SCULPT_FLAG_MIRROR in the llSetPrimitiveParams series of functions. This makes it possible to mirror a sculpt by script.
2010-06-04 19:36:31 -07:00
63797445be
various refactorings on methods to replicate IAR paths to user inventory in order to improve readability
2010-06-05 00:48:33 +01:00
3c3df9f3e9
refactor: do pathname trimming outside of ReplicateArchivePathToUserInventory()
2010-06-04 23:34:42 +01:00
72bd68a21f
add ability for load iar/save iar to take in arbitrary options
...
not used for anything yet
2010-06-04 22:17:23 +01:00
0526d3a535
bring TestLoadIarV0_1AbsentUsers() back online
2010-06-04 21:19:37 +01:00
a08ace300b
bring TestIarV0_1WithEscapedChars() back online
2010-06-04 21:15:25 +01:00
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
f523c2033d
bring test TestLoadIarV0_1ExistingUsers() back online
2010-06-04 21:11:13 +01:00
df2bcf7b6b
remove pointless mock user account service since the real one can now be easily configured for test purposes
2010-06-04 20:56:24 +01:00
f319d2ef5e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-06-04 20:44:01 +01:00
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
281eb0c626
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-06-04 11:00:29 -07:00
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
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
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
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
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
dda7185b43
Change the admin kick message to something more generic, "OpenSim Manager" is not really accurate
2010-06-03 17:55:50 -07:00
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
b198763d67
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-02 01:22:10 +01:00
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
53e96dccef
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:21:50 +01:00
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
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
d8962ef415
Add two new osFunctions:
...
list osGetPrimititveParams(key prim, list rules);
osSetPrimitiveParams(key prim, list rules);
2010-06-02 01:01:56 +02:00
d740035ef4
Applying patch from coyled to fix IAR support with the SimianGrid connectors
2010-06-01 13:32:14 -07:00
90c814a7ca
Fix nullref in cmGetAvatarList() (ported from 0.69)
2010-06-01 13:29:12 -07:00
a863eb9da3
One should not lock null objects.
2010-06-01 19:01:57 +01:00
6668c789d3
One should not lock null objects.
2010-06-01 19:01:21 +02:00
9c3c020697
Lock the object queue when dequeueing
2010-06-01 15:08:45 +01:00
c900134f91
Lock the object queue when dequeueing
2010-06-01 16:03:53 +02:00
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
16d8602d3c
Fix prim returns I broke earlier
2010-06-01 03:17:21 +02:00
4867dd135d
Fix prim returns I broke earlier
2010-06-01 02:12:56 +01:00
a5728cc91c
Fix prim returns I broke earlier
2010-06-01 02:10:53 +01:00
f29cb57bf1
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:10:22 +01:00
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
2fce7d9bcf
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 02:10:08 +01:00
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
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
bf233ea0dc
Continuing refactor. Refactor DeRezObject to deal with multiple objects
2010-06-01 02:27:30 +02:00
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
70f7790413
Split GetAxisAlignedBoundingBox into two methods to allow calculation of
...
combined bounding boxes and offsets
2010-06-01 01:07:46 +02:00
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
d4b4cbf5a5
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 19:00:02 +02:00
e515467c5e
Fix create selection getting overwritten by multiple updates for the same prim.
2010-05-31 17:55:56 +01:00
6c1665bf46
Fix casting in llParcelMediaCommandList so that it actually, you know, works
2010-05-31 08:38:41 -07:00
bbb4d6e4c9
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-31 01:02:04 +02:00
8df9f272eb
Fix a nullref in EventManager caused by RegionReady not setting the scene
2010-05-30 23:57:13 +01:00
890f3cc54c
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 15:46:54 +02:00
f1a1d7a521
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
59a5367433
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 13:46:05 +02:00
bfcac0ede8
Changes OSSL Api permissions for the case of UUID list. In 0.6.9, the UUIDs
...
would be the IDs of the prim owners in whose prims these functions would
run. This changes it so the UUID is the SCRIPT CREATOR instead. Further,
osfunctions limited by uuid will not run if the creator and owner differ
and the owner has mod rights on the script.
There is still a danger in passing moodifiable scripts to others, as they
can insert a harmful function, then remove the mod rights to make it runnable.
As before, care needs to be taken, but where it was modable prims that were
the risk before, modable scripts are the weak spot now.
In cases where prim owner == script creator == script owner, nothing will
change.
2010-05-30 12:45:16 +01:00
84e30bee6d
Revert "Meta7 Communities : Authorization service added, skeleton, not yet functional"
...
This reverts commit 31439293cc
2010-05-29 12:34:02 +02:00
31439293cc
Meta7 Communities : Authorization service added, skeleton, not yet functional
2010-05-29 03:56:34 -07:00
e3dac1292e
Implement suspended updates - When an operation is occurring on lots of prims in a single group, don't schedule any updates until the operation has completed. This makes things like llSetAlpha(LINK_SET,0.0,ALL_SIDES); a *lot* faster, more efficient and less buggy, and also makes unlinking a lot better. Linking is still treacherous.. this needs to be analysed.
2010-05-29 02:10:34 -07:00
3a5d379db8
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-29 01:07:19 -07:00
2f409116db
Stop IGridService from throwing a fatal exception when an IPEndPoint cannot be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
2010-05-29 01:03:59 -07:00
e7bf6afd3a
Get the user's DOB back from the server response properly.
2010-05-29 05:14:18 +02:00
cd77648f48
Get the user's DOB back from the server response properly.
2010-05-29 04:09:47 +01:00
191db0e6a4
get TestSaveIarV0_1() uncommented but not running as a test yet since I didn't get the authentication server to work and my brain is about to fizzle out my ears
2010-05-28 23:14:24 +01:00
542e6b8af4
Merge branch 'master' into careminster-presence-refactor
2010-05-28 21:56:42 +01:00
a60ca5236c
restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to work with the new UserAccountService/InventoryService
2010-05-28 21:37:48 +01:00
0ef41e62bc
minor: move a method so that the #regions make more sense
2010-05-28 21:18:55 +01:00
505cb82dee
fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work
2010-05-28 21:14:15 +01:00
3c0f34bc2b
If a command has descriptive help, add a line above and below the print out for readability
2010-05-28 20:51:02 +01:00
2e2f73bdd5
minor: remove mono compiler warning
2010-05-28 20:12:06 +01:00
fff5459f4d
Add ability to load IARs directly from URIs
...
So, something like
load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar
Will load my IAR directly from the web.
2010-05-28 20:07:15 +01:00
14c39461c2
minor: remove mono compiler warning
2010-05-28 19:41:13 +01:00
b1298fca0a
tidy up help information on load oar and save oar
2010-05-28 19:36:30 +01:00
d72435693b
refactor: move GetStream and URI methods from ArchiveReadRequest -> ArchiveHelpers
2010-05-28 19:21:00 +01:00
6b568af565
Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.
...
This is going to be the right behaviour in all cases, I should think.
This means that avatars in region when an oar is loaded do not lose their attachments
2010-05-28 18:49:32 +01:00
1042ce7283
comment out large chunks of appearance/inventory region access services to eliminate warnings that this code is unused
2010-05-28 18:42:25 +01:00
565db4635f
add a smidgen more log debug information in the form of the operating system version
2010-05-28 18:30:33 +01:00
877fe774ef
Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the object's corresponding single avatar update method, rather than calling the sceneviewer directly
2010-05-28 17:58:51 +01:00
596001632b
remove redundant ScenePresence.QueuePartForUpdate() - every place in the code calls SceneViewer.QueuePartForUpdate() directly
2010-05-28 17:53:57 +01:00
9ea42fdfab
Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
2010-05-27 21:31:10 -04:00
7d6680b38a
fix hanging output throttle arithmetic
...
had multiply overflow and subtract wrap-around errors
2010-05-27 21:28:47 -04:00
8fb706716b
Prevent a null ref
2010-05-27 19:09:06 +01:00
ecc77e3886
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 19:09:00 +01:00
ba49319c07
Prevent a null ref
2010-05-27 20:08:48 +02:00
ac5373427f
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast. Clean this time
2010-05-27 20:08:12 +02:00
a48d7f62a7
Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
...
Some other stuff snuck in.
This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
6b6425aa5e
Comment noisy "CONNECTION DEBUGGING" messages, because they push more
...
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
f90d81a864
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 19:26:30 +02:00
9ac8d2de79
Just because there is an agent update handler, that doesn't mean there is
...
a pre agent update handler. Null check these separately.
2010-05-26 18:25:53 +01:00
97501495eb
Merge branch 'master' into careminster-presence-refactor
2010-05-26 17:19:02 +01:00
a69c1c7898
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-26 10:56:37 +01:00
1c7f60ab49
Merge branch 'unitests'
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-26 10:56:24 +01:00
5d65ef2db3
Minor correction to AssetTests.cs
...
(forgot to change test descriptions, has no effect on running the tests)
2010-05-26 10:25:56 +03:00
5e719d13ef
fix sculpt normal direction for mirrored plane sculpts
2010-05-24 19:15:04 -07:00
00737f1c13
Merge branch 'master' into careminster-presence-refactor
2010-05-24 23:40:22 +01:00
7d9b316ce6
Change the way alpha is interpreted on prim text. Manris #4723
2010-05-24 23:37:47 +01:00
c7c9edd049
minor: expand upon comments about not scheduling two full updates for attachments
2010-05-24 20:11:06 +01:00
30e94cd075
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-23 12:23:16 -07:00
1ab826d67c
The 8th migration statement in AssetStore.migrations didn't look right.
2010-05-23 12:22:47 -07:00
57f4729eea
Ensured that tests are skipped for wrong conn string, also m_log chng
...
The base test class now tries to connect to DB, ignores all tests in the
class if unable to.
Also m_log changed to instance field (which in this case shouldn't cause
any problems), to avoid having to define it separately in each derived
class. Here I touched things that I don't understand well (using log4net),
so please review this commit.
2010-05-23 12:46:33 +03:00
b9b6d9c4ea
Removed (unused?) empty SQL files from MSSQL resource dir
...
There was a whole bunch of these SQL files, all empty and apparently
unused. Removing them is just a clean-up, if anybody has a reason for these
files to be there, feel free to revert.
2010-05-23 11:48:30 +03:00
05d9ca1b26
MySQL Migrations: Minor correcton to Region/Estate split
...
(some Estate SQL left behind in the Region migration)
2010-05-23 11:48:28 +03:00
52a3dbd076
MSSQL Migration: CreatorID in InventoryItems changed to VARCHAR(36)
...
Again, the same thing about potentially having non-GUID CreatorID.
2010-05-23 11:48:25 +03:00
89b7c64b6f
Various minor changes in the data tests
2010-05-23 11:48:22 +03:00
9976cb93ce
Further corrections to MS SQL stores (now passes all tests)
...
Besides, AssetData is slightly optimized to StoreAsset in one request
("IF EXISTS() UPDATE ... ELSE INSERT ...")
The main change in the MS SQL Inventory implem. is that it now return
empty list (or whatever) when called with UUID.Zero, which is consistent
with how the code for other DBs work.
I did no changes at all in XInventory, as there is no test set for them.
2010-05-23 11:48:19 +03:00
ebc2b6d4f6
Split migrations for RegionStore and EstateStore (see WARNING!)
...
ok, so the estate stores now want their own migration files, but as it
happened the SQL definition were inside the Region migrations.
It seems better/cleaner to keep each 'store' separately updatable.
WARNING: any editing in the middle of the migration scripts (as opposite
to just appending to them) has the potential of messing up updates of
existing databases. As far as I can see, this one is (probably) safe,
the worst that could happen is the EstateStore migration silently fail
if the estate the tables are already there.
2010-05-23 11:48:16 +03:00
2537acc04d
Unitests: Asset, Estate, Region (the "legacy" one), Inventory
...
The tests have been modified to work under NUnit 2.4.6
(the one currently used in the project).
They will also work with NUnit 2.5+ as is, but will look better
if you #define NUNIT25 for them.
2010-05-23 11:48:10 +03:00
330ad501a5
Added MS SQL test conn to INI - only as an example, modify before use!!!
...
NOTE that this INI file is currently loaded as a embedded RESOURCE, which is weird and has a
disadvantage of having to rebuild the Tests whenever the conn strings are changed.
The only reason is that I couldn't figure out a reliable way to put this INI into the correct
dir at runtime. If somebody can do it, that would be cool.
2010-05-23 11:48:08 +03:00
40031e6d37
Removed MySql and SQLite-specific asset test files
2010-05-23 11:48:05 +03:00
b1e6e99506
BasicAssetTest.cs replaced by AssetTests.cs
...
AssetTests: The name has changed to reflect the fact it is no longer a base class,
but the complete asset test for all supported databases.
The test can also check storing of CreatorID, but the feature is
disabled at this commit!
2010-05-23 11:48:02 +03:00
749cf0f6eb
Bugfix in tests (must clear db before migrations, not after)
2010-05-23 11:47:59 +03:00
f527584ed3
EstateData tests passing on all DBs
2010-05-23 11:47:56 +03:00
94f4c20866
Corrections in RegionTests.cs. It now fully works!
...
The problem was that some tests relied on prior tests
to leave the DB in a particular state, but the test class
cleared the DB every time. The affected tests have been
merged into one to remove the dependencies.
tested on all 3 Dbs, all tests green.
2010-05-23 11:47:54 +03:00
6322a085b3
Minor corrections in BasicDataServiceTest.cs
...
(added more functions for cleaning up DB from the
derived tests)
2010-05-23 11:47:51 +03:00
187a98615b
MSSQL: added asset_flags, CreatorID to migrations
2010-05-23 11:47:48 +03:00
49f4cc4246
MSSQLAssetData updated to support [CreatorID], [asset_flags]
2010-05-23 11:47:45 +03:00
f7bf3facff
MSSQLAssetData: fixed some weirdness
...
Fixed unfinished SQL in FetchAssetMetadataSet, fixed SQL
in UpdateAsset (must not modify ID).
NOT tested! But apparently shouldn't work worse than the previous version,
esp. the FetchMetadata thing.
2010-05-23 11:47:42 +03:00
7f70ae0ebd
All data tests made DBMS-independent
2010-05-23 11:47:39 +03:00
91ad1f4ee7
Added generic base classes for testing database services
...
These are some generic classes that simplify writing tests
for any of the data connectors and databases. Among other
things, configuring the connection strings is done once,
in a separate resource file.
Tests based on the new BasicDataServiceTest class require
NUnit 2.5 or better.
2010-05-23 11:47:36 +03:00
f84f0dbd51
Remove an unneeded conditional
2010-05-23 06:12:40 +01:00
72b96e8121
Add the SitGround flag back in
2010-05-23 06:12:11 +01:00
a9dad99432
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-05-23 06:09:54 +01:00
b2197e3b94
Apply http://opensimulator.org/mantis/view.php?id=4632
...
Adds dialog methods for MRM.
Thanks ziah.
2010-05-21 23:37:05 +01:00
074937e0e5
Apply http://opensimulator.org/mantis/view.php?id=4627
...
Adds OwnerId and CreatorId properties to MRM.IObject
2010-05-21 23:34:47 +01:00
e5bcd8b341
Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628
...
This prevents a ground-sitting avatar from being moved about in mouselook
Thanks mirceakitsune!
2010-05-21 23:29:37 +01:00
9e61e120a1
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 23:12:47 +01:00
4e45718833
Added overload of SendGenericMessage to LLClientView with string list as parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch.
2010-05-21 23:08:07 +01:00
6918446fcd
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 22:17:58 +01:00
d0eecf0398
Added a sanity check before using m_config in the Scene constructor
2010-05-21 14:17:03 -07:00
abd5d1f747
* Added code comments to Prioritizer.cs that document how to add a new update priority policy
2010-05-21 14:04:10 -07:00
89f1ddb0a5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-05-21 21:58:55 +01:00
5287c5f7fb
rearrange SceneGraph.AddSceneObject() to return earlier if an object with that uuid is already in the scene
...
this means that we don't perform pointless work
2010-05-21 21:57:56 +01:00
93ef65c690
* Moving all of the prioritization/reprioritization code into a new file Prioritizer.cs
...
* Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now
* Improved the distance and front back policies to always give your avatar the highest priority
2010-05-21 13:55:36 -07:00
4b518e0288
minor: remove LongRunning test designator from TestAddSceneObject() since it isn't, really
2010-05-21 21:48:47 +01:00
76135eec5b
add test to make sure that adding an object where one already exists in the scene with that uuid fails
2010-05-21 21:46:41 +01:00
8d968249ec
extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean
...
improve test to retrieve object by known uuid rather than dynamically assigned local id
2010-05-21 21:38:47 +01:00
f83acf533b
Fix a problem where SceneGraph.AddSceneObject() would return false on successfully adding an object rather than true, in defiance of its method documentation
...
This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added.
2010-05-21 21:22:53 +01:00
297bcb5c3d
Merge branch 'master' into careminster-presence-refactor
2010-05-21 21:16:04 +01:00
4e23acb133
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-21 21:04:17 +01:00
2b5b2f4e60
Add a new priority scheme that works like FrontBack, but completely deprioritizes
...
static prims, creating a hierarchy as follows:
0 == own avatar < other avatars < pysical prims < static prims
For a child agent, simply acts like FrontBack
2010-05-21 21:02:26 +01:00
721c1085da
make oar object filename/pathname creation a helper method
...
reused in both tests and oar code
reduction in checking is outweighed by greater test clarity
2010-05-21 20:43:11 +01:00
682efe9463
minor: refactor CreateAsset to eliminate dupe code
2010-05-21 19:41:00 +01:00
74ef1ed36f
add prim item and test asset save in save oar unit test
2010-05-21 19:36:39 +01:00
78a0fd5281
Only send dialogs and notices to root agents, not child agents
2010-05-21 17:22:39 +01:00
c0cb66e602
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:58:34 +01:00
1d6ab445ab
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 15:31:27 +01:00
9f2d1e9294
* Made PriorityQueue non-generic so it natively understands EntityUpdate structs
...
* Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates
2010-05-20 23:53:27 -07:00
344f209565
Merge branch 'master' into careminster-presence-refactor
2010-05-21 06:28:13 +01:00
af5eeab7cf
Ensure that the first update sent out for any given prim is a full update
2010-05-21 07:37:55 +02:00
792e149c7e
Ensure that the first update sent out for any given prim is a full update
2010-05-21 05:13:31 +01:00
213e372253
Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.
2010-05-20 20:24:50 -07:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
d28da5e5ce
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-21 03:41:32 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
147c2d6f80
Change the way the object perms are propagated to attempt to salvage
...
some older content
2010-05-21 02:31:14 +01:00
13c22015e5
Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
2010-05-20 15:14:14 -07:00
beed74096c
Merging slimupdates2
2010-05-20 12:28:13 -07:00
56f3cb6da0
* Don't send texture data for prims in ImprovedTerseObjectUpdate packets unless we were asked to
2010-05-20 12:04:12 -07:00
59dec2f989
* Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
...
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
859beaf830
Revert one of the previous patches' hunks. The new code looked better, but
...
was less efficient.
2010-05-20 11:03:38 +01:00
ce787a4c41
Series of patches to include creator ID in assets.
...
Contains a migration.
SQLite: May contain nuts.
The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db.
BasicAssetTest checks CreatorID storage, new test for weird CreatorID
(now also checks that non-GUID or empty CreatorID gets stored correctly)
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-20 11:01:51 +01:00
5532341bf9
Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo with kitto
2010-05-19 14:04:44 -07:00
6933b48a7e
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:49:34 -07:00
f77f9ecd8f
Fix a nullref issue in SitAltitudeCallback
2010-05-19 13:44:59 -07:00
d6a6668bd7
Scrambled asset type in BasicAssetTest.cs!
...
The asset type wasn't in the list of "DontScramble" fields,
so the test assets were stored with randomized type, which
caused exception on reading them.
Also the scrambler was moved from local var to the class level,
so it could be used in the new tests I've added (see the next commit).
2010-05-19 21:50:34 +03:00
64fe823b92
MySQLAssetData.cs now supports asset_flags, CreatorID
2010-05-19 21:50:32 +03:00
eacd8d0263
MySQL: added CreatorID, moved asset_flag to migration script
2010-05-19 21:50:30 +03:00
accf8c420d
SQLite: CreatorID added (and asset_flags moved) to the migration script
2010-05-19 21:49:30 +03:00
c6977cbd4d
Added CreatorID to SQLite asset data
2010-05-19 21:49:24 +03:00
ccee95552f
A bit of harmless refactoring in SQLiteAssetData.cs
2010-05-19 21:49:22 +03:00
527a257b9f
Kind of fixed Melanie's "Exception(sql)" correction
...
Throwing an Ex. with SQL command in the message looks weird,
this is a bit better, but I'm still not sure if that's the
proper way to handle. Also, there is a catch one level up,
so is this one necessary?
2010-05-19 21:49:18 +03:00
fc76b5f589
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:24:54 -07:00
71a95900fd
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-19 00:21:38 -07:00
ba36c62caa
Fix a null reference issue in cmGetAvatarList()
2010-05-19 00:20:51 -07:00
e4b8d76b10
Change appender to deal with line feeds more intelligently.
...
Change migration error reporting to not truncate the statement when
reporting. It's a bit messier than the old error reporting, but at least
one gets an idea of what could be wrong again. And things look a lot
neater now.
2010-05-19 04:17:56 +01:00
0c209a469b
Clean up output a bit
2010-05-19 03:48:03 +01:00
20642f2f21
Fix the migration message to say "Continuing" again. Remove line feed, which
...
prevented the full message from displaying.
2010-05-19 03:26:37 +01:00
9fa8013ca5
Remove the return that was inserted in the last merge to allow
...
migrations to continue in the face of an error
2010-05-19 03:07:31 +01:00
dedc0c0bd4
Revert "Allow migration steps to fail again without bringing down the house"
...
This reverts commit 167db50259
2010-05-19 02:47:31 +01:00
167db50259
Allow migration steps to fail again without bringing down the house
2010-05-19 02:33:23 +01:00
298368dd99
Merge commit 'alex/mssql-estate-bugfix'
...
This fixes some type conversion bugs and also makes the estate lists
work properly for MSSQL. Strawberry, please check this.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 23:39:09 +01:00
d2bc673667
Make m_log in migrations private. Define new m_log in derived class
2010-05-18 23:33:05 +01:00
caf61ab7d8
Binary Guids are 16 chars long. Fix parser.
2010-05-18 23:22:30 +01:00
deae030145
Some more corrections after MySQL connector update
2010-05-19 02:28:19 +03:00
8a0c5d14d4
All (?) MySQL stores fixed to use DBGuid.FromDB()
...
This was needed if we want to update to the latest MySQL
connector dll. It automatically converts CHAR(36) to
Guids, so getting them as strings no longer works.
By using DBGuid.FromDB(), we unlink from any particular
storage format of GUIDs, could even make them BINARY(16)
if we like.
Actually not all MySql units are touched, but the remaining ones don't
seem to be affected (they don't read GUIDs from DB)
2010-05-19 01:33:02 +03:00
a27d49b188
Added DBGuids.cs (static func DBGuid.FromDB()
...
This DBMS-independent function to be used converting UUIDs
from whatever format used in the DB (string/binary/Guid).
This is mostly needed for MySQL, as in MSSQL they are always
UNIQUEIDENTIFIERs and in SQLite always strings (but would look
better if we use it there anyway).
2010-05-19 01:32:50 +03:00
d95f232629
Massive bugfix in MSSQLEstateData (now works!)
2010-05-18 21:08:51 +03:00
e260610c00
Merge branch 'Migrations'
...
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
55f124745f
Allow remote admin to be used on a different port from the main region port
2010-05-18 19:25:40 +02:00
3e1f2ddb8e
Allow remote admin to be used on a different port from the main region port
2010-05-18 17:01:44 +01:00
1c3790a70d
Merge branch 'master' into careminster-presence-refactor
2010-05-18 15:31:19 +01:00
df04ccfdc3
Change an exception reporting to include the stack trace. "e.Message" just
...
_won't_ do. Might look more elegant, but it's too little information.
2010-05-18 15:30:08 +01:00
bb0806c61e
Don't send kill packets to child agents as we close them
2010-05-18 03:44:09 -07:00
1c040d8c1e
Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it.
2010-05-18 03:24:43 -07:00
ed1cfb5245
Missed a nullref in the previous commit
2010-05-18 02:33:41 -07:00
91b1d17e5b
Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready.
2010-05-18 01:09:47 -07:00
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
c25c40a3f9
Following on from the last commit, the stop/disconnect packet should NOT be sent when the user logs out. This eliminates the annoying "crash on log out" bug, and allows the client to commit important information at the last moment (attachment data!)
2010-05-17 15:24:28 -07:00
6bc7e3429f
Provide interface to prevent the client close function from sending the stop packet
2010-05-17 14:32:21 -07:00
8f838c722d
When killing a zombie session, don't send the stop packet since it often has the effect of killing a newly connected client.
2010-05-17 14:14:19 -07:00
a003c36de5
Merge branch 'master' into careminster-presence-refactor
2010-05-16 20:32:58 +01:00
a6023ea89e
Prevent a crash when the two agent dictionaries get out of sync
2010-05-16 20:31:02 +01:00
2fb79646c6
Fixes mantis #4691 for real. This time I tested it, and it works.
2010-05-16 10:32:57 -07:00
d8bf370fd6
Merge branch 'master' into careminster-presence-refactor
2010-05-16 17:22:38 +01:00
0b43b263d4
Fixes mantis #4691
2010-05-16 09:12:40 -07:00
b7e6b58857
Fixes mantis #4622 .
2010-05-16 09:01:27 -07:00
49f4becdae
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
...
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
dfeb9a0b5c
MS SQL migrations converted to the new format
2010-05-16 17:04:50 +03:00
1ad12851d0
Migrations for SQLite converted to new format
2010-05-16 17:04:39 +03:00
ee713cb253
Converted MySQL migration history to the new format
...
Replaced all NNN_StoreName.sql migration resources with a more
readable, single-file-per-store
2010-05-16 17:04:13 +03:00
a723225179
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-16 15:02:23 +01:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
b49fb3db7c
Added MySqlMigrations.cs (supports stored proc/funcs)
...
Uses MySqlScript class to correctly run proc/func definitions
that need delimiter change. Requires MySql.Data.dll 6.2 or later.
2010-05-16 16:25:08 +03:00
8b6a295874
Migration.cs supports single-file migration history format
...
Scans for migration resources in either old-style "scattered" (one file per version)
or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections).
In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script
that must be sent to the server separately. The old-style migrations are loaded each in one piece
and don't support the ':GO' feature.
Status: TESTED and works fine in all modes!
2010-05-16 16:22:38 +03:00
a974146921
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-16 01:48:28 -04:00
d4192dcb2e
* Revert last commit for now at Melanie_T's request.
...
* Additional ways of configuring opensim break with this
2010-05-16 01:47:53 -04:00
ff4f50396a
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-15 20:28:14 -07:00
e5e52e4072
This combination is working. It all points to not being able to use 127.0.0.1/localhost in testing HG situations. The login server must have the LAN IP address, and the regions must show ExternalHostname as SYSTEMIP. Working, but this needs more testing.
2010-05-15 20:27:25 -07:00
019925bb2f
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-15 23:22:07 -04:00
dc1a3e9787
* Add User Friendly Configuration File Exists check. If OpenSim.ini and either StandaloneCommon.ini or GridCommon.ini don't exist in various casings then offer to copy the files for the user while warning them that they're missing out if they don't read the files.
2010-05-15 23:21:36 -04:00
74b23ff9c6
Almost, but not quite. Commenting verification again, until I understand where 127.0.0.1 is being transformed to the local IP address. I suspect it's Adam's NAT snippets.
2010-05-15 19:58:30 -07:00
2a1e45f657
Finalized the client's TCP IP address verification process for HG1.5.
2010-05-15 19:25:14 -07:00
9dbe90801b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-15 02:20:47 -07:00
36bcab5f07
Refactor scene presence list for lockless iteration. Lock contention will now only be for simultaneous add/removes of scene presences from the scene.
2010-05-15 02:20:23 -07:00
4b755c6d80
delete now unused MessageServerInfo
2010-05-15 02:17:10 +01:00
98f2b798ff
Address symptom of Mantis 4588 (though not the cause) by moving the avatar dereference inside the exception catch
2010-05-15 01:07:45 +01:00
3d72a73b22
Apply patch from http://opensimulator.org/mantis/bug_view_page.php?bug_id=4671
...
Fixes a bug where the viewer didn't recieve the uuid of a chat broadcasting object
Thanks crystalsgalicia!
2010-05-14 21:25:14 +01:00
231cc64709
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupdates2
2010-05-13 14:23:16 -07:00
4c740e1717
Implements three new OSSL functions for parcel management: osParcelJoin joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
2010-05-13 14:22:48 -07:00
9079ad5ceb
Add some debug output to GetAgent to try and track down our presence problems
2010-05-13 12:40:18 -07:00
4e7013d5d5
Made fields consistently protected.
2010-05-13 07:59:30 -07:00
5d8638ed88
Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is working)
2010-05-12 16:05:48 -07:00
bf5c81d77e
* Initial commit of the slimupdates2 rewrite. This pass maintains the original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
2010-05-12 15:59:48 -07:00
fd37a21b59
Kill some locks that have crept into SOG
2010-05-12 08:34:47 -07:00
7705012ee7
Optimise the heavily used GetScenePresences; eliminate the array->list conversion on every call and transition from hard locks to ReaderWriter locks.
2010-05-12 08:25:40 -07:00
98bd3e1f34
Don't convert UUID -> ToString for every friend (Minor optimisation based on profiler feedback)
2010-05-12 07:14:06 -07:00
40e05f4109
Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)
2010-05-11 09:28:46 -07:00
14a86de115
Fix another ReaderWriterLockSlim issue
2010-05-10 12:45:33 -07:00
739b5e2c08
Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making offline friendship offers fail in grids.
2010-05-10 08:01:00 -07:00
5814d16b58
Merge branch 'master' into careminster-presence-refactor
2010-05-10 15:57:32 +01:00
3cda854ef3
Fix overlooked readLock which was left open
2010-05-10 08:47:41 -07:00
ab716125d7
Correct an odd merge anomaly
2010-05-10 05:51:49 -07:00
2e94c75729
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-05-10 05:44:24 -07:00
2fe669448f
Greatly improve login time for users with large friends lists by requesting all unknown UUID's in one go rather than individually
2010-05-10 05:43:16 -07:00
fada4cb6c4
Merge branch 'master' into careminster-presence-refactor
2010-05-10 04:05:04 +01:00
31dc77d8a1
Return agents when angle is PI
...
Fixes Mantis #4703
2010-05-10 04:02:56 +01:00
3e8ceb3509
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-10 03:57:44 +01:00
89c762209c
Fix a null ref on region crossing
2010-05-10 03:57:17 +01:00
6f2f0fa0ca
OK, this really fixes it, I promise.
2010-05-09 14:12:59 -07:00
9cf6b81256
Yey for unit tests. The previous commit had a couple of bugs on SQL statements. Fixed here.
2010-05-09 14:02:02 -07:00
b233a4b2ca
* Fixed spamming the assets table with map tiles. The tile image ID is now stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone.
...
* Fixed small bug with map search where the local sim regions weren't found.
2010-05-09 13:39:56 -07:00
6a3e1734e6
Merge branch 'master' into careminster-presence-refactor
2010-05-09 18:03:57 +01:00
bc6995f921
Add Delete handler to SQLite (NG)
2010-05-09 18:02:36 +01:00
60357d3778
Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler.
2010-05-09 17:56:52 +01:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
9b22393cf3
Add a field asset_flags and a corresponding enum to the asset database. This
...
CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS
WITH LATER ONES. It may also eat your babies, yada, yada, yada.
The usual cautions for migrations to the assets table apply.
Coding: Can not guarantee nut free.
2010-05-09 17:02:22 +01:00
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
d72769930a
More cleaning on presence. Friends online/offline works again.
2010-05-08 07:44:07 -07:00
420dd78fb7
Merge branch 'careminster' into careminster-presence-refactor
2010-05-08 14:17:43 +01:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
bfb7a49990
Fixed Presence unit test. Removed unnecessary packing/unpacking of obsolete fields.
2010-05-07 21:56:14 -07:00
15562017f2
These files are part of the GridUserService write-up.
2010-05-07 21:32:02 -07:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
bc7d84b75c
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-07 15:16:59 -04:00
add7abc1de
Fix Mouse+WASD makes Av rise; Fix PREJUMP.
2010-05-07 14:12:07 -04:00
eb6d63ab8e
improve handling of undersize sculpt textures
2010-05-06 23:02:24 -07:00
39c5ddc837
corrections for face numbering and uv mapping, mostly for spheres - sync with PrimMesher r56
2010-05-06 22:08:59 -07:00
5d1e9947ed
Sculpt meshing refactoring - improves mesh accuracy and UV mapping
...
Sync with PrimMesher r55
2010-05-06 21:36:27 -07:00
b309781f2d
Merge branch 'master' into careminster-presence-refactor
2010-05-07 01:00:58 +01:00
6182d71326
Also remove sale and search flags on god owner change.
2010-05-07 00:52:52 +01:00
907fce8406
Remove land that is being abandoned from search. This is now consistent with
...
sale and reclaim.
2010-05-07 00:50:26 +01:00
9ecebcdf13
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
2010-05-06 16:39:21 +01:00
69d0201d4c
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
Causes an exception within HttpServer, headers have already been sent.
This reverts commit 8187fccd25
2010-05-06 16:38:23 +01:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
533bd1bd9b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-06 16:08:24 +01:00
adc34c7129
Ensure the show in search flag is cleared on ownership change. Also, when
...
land is reclaimed, reset it's for sale flags so it can't be bought again right
away.
2010-05-06 16:07:15 +01:00
53594e599e
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
...
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
4183cef409
* Fixes LandDataSerializerTests on Windows by stripping CR from the serialization result since the reference serialization has LF only.
...
* Added a bool result and then an Assert.That(result) because resharper was having a hard time with the equality compare in Assert.That.
2010-05-05 21:22:29 -04:00
02dea4ce58
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-06 02:02:12 +02:00
8b4f729a21
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-05 23:58:14 +01:00
ebc3726d52
Added copying of Viewer field to the agent circuit data that is being passed on TPs and crossings.
...
(XmlRpcGroups files want to be committed too)
2010-05-05 16:54:48 -07:00
2b48ed60ec
Remove the m_Viewer variable and make the property a shortcut to the
...
proper field in AgentCircuitData instead
2010-05-05 23:41:57 +01:00
7e0d5b8665
Merge branch 'master' into careminster-presence-refactor
2010-05-05 22:50:11 +01:00
2d9a20529d
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-06 00:54:21 +02:00
733a07e061
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-06 00:34:49 +02:00
ad2039a8c4
Stab a test fail
2010-05-05 22:48:05 +01:00
e45f5ac126
Plumb Viewer version into ScenePresence for initial login. It's still not
...
carried along
2010-05-05 22:33:22 +01:00
2ebe148266
Plumb the viewer version string through into AgentCircuitData. Now all that
...
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
65775b87e5
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 23:06:36 +02:00
fe8399d1bf
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
e0f9b1a699
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 21:12:02 +02:00
7aed89a8d0
Removed a test for a "can't happen" case. ParentGroup is never null anymore.
2010-05-05 18:51:01 +01:00
8187fccd25
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:12:52 +01:00
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
6fdd5bfe2d
Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups"
...
The patch was for 0.7
This reverts commit 608bb0dfef
2010-05-05 16:03:20 +01:00
608bb0dfef
Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups
...
Mantis #4646
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 14:37:05 +01:00
a9db266d93
* Added an important comment to warn people not to use MockConsole for anything but testing.
2010-05-04 22:16:07 -04:00
f005e570aa
* This should fix the tests failing because of a MainConsole.Instance null reference
...
* Added a MockConsole that doesn't require a handle to System.Console
2010-05-04 22:13:25 -04:00
efc3241541
Add perms check to the teleport home client command handlers.
2010-05-05 01:32:55 +02:00
34d882b70d
Add perms check to the teleport home client command handlers.
2010-05-04 23:15:07 +01:00
49efec2ef1
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 23:45:59 +02:00
3761f79971
Strip estate message sending out from the estate management module and
...
the dialog module. Convert it to an event on the estate module interface.
The old implementation did the same as message to region, a button that
is right next to it on the UI. This implementation prevented people from
adding a more sane one in a module.
2010-05-04 21:26:10 +01:00
07e0732a10
make the events more useful by providing the source region
2010-05-04 21:16:20 +02:00
5a4cef6b36
make the events more useful by providing the source region
2010-05-04 18:55:24 +01:00
9ca79df802
Merge branch 'careminster' into careminster-presence-refactor
2010-05-04 18:41:20 +01:00
585259ef08
Merge branch 'master' into careminster-presence-refactor
2010-05-04 18:39:04 +01:00
97bbce92a8
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 20:57:31 +02:00
1d75450743
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-04 18:37:11 +01:00
d997fc7b76
Add events to the estate interface to let interested modules know of
...
changes to estate settings
2010-05-04 18:36:45 +01:00
61ce4ca9c7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-05-04 09:44:56 -07:00
484584b83c
Fixed: migration #2 for SQLite. Problem was that ATTACH cannot be done inside a transaction.
2010-05-04 09:44:30 -07:00
ce86d39c70
Add "reload estate" command to sims
2010-05-04 18:31:52 +02:00
4f93d30790
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 18:10:13 +02:00
da849aea78
Allow regions to get the list of the other regions in the estate
2010-05-04 17:56:30 +02:00
9cf0077bf9
Add "reload estate" command to sims
2010-05-04 16:11:06 +01:00
6eea0a3931
Allow reloading of estate settings into a running region. Move sun update
...
helper into Scene, since that is less evil than exposing m_storageManager
to the public.
2010-05-04 15:52:36 +01:00
9635af61f0
Allow regions to get the list of the other regions in the estate
2010-05-04 15:52:29 +01:00
dbce360566
Fix full circle sensors
2010-05-04 02:43:22 +02:00
c86259c671
Fix scripted give and interactive give to offline avatars. Both folder and
...
single items are now supported. Magic Boxes, yeah!
2010-05-04 00:44:05 +02:00
23d7a942ea
Refix the fix
2010-05-03 23:11:48 +01:00
92dff5edb1
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:11:37 +01:00
deaa79ca9e
Refix the fix
2010-05-03 23:53:49 +02:00
80bf3934af
Add folder version incrementing to XInventoryService. Fixes offline give
...
for avatar->avatar
2010-05-03 23:47:32 +02:00
4df87631ed
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 23:44:23 +02:00
f61b879f2d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 21:25:40 +01:00
92561aef8d
Store given items in correct parent folder. Fixes items given to offline avatars
...
not getting lost.
2010-05-03 21:25:02 +01:00
b10811a13b
Assorted bug fixes in hypergrid linking.
2010-05-03 09:50:55 -07:00
9c8d7d34b3
Fix a bug in owner change notification
2010-05-03 04:55:41 +02:00
8766401777
Adapt CM to the new CHANGED_OWNER handling
2010-05-03 04:28:30 +02:00
1494c84f56
Fix a bug in owner change notification
2010-05-03 02:40:52 +01:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
75063e8f60
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-05-03 01:31:32 +01:00
d6bfc490f7
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-05-02 20:45:01 -04:00
b836249926
* Untested Suggestion from lkalif to change
...
remoteClient.SendMapBlock(blocks, 0);
to
remoteClient.SendMapBlock(blocks, 2);
in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2010-05-02 20:44:34 -04:00
7a8ad1ceb2
Make in-place sale send CHANGED_OWNER again
2010-05-03 01:30:57 +01:00
45301d8a49
Defer sending of CHANGED_OWNER to make it work on rezzed objects and
...
attachments in addition to objects sold in place
2010-05-03 01:14:38 +01:00
175f3f992a
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-03 01:50:32 +02:00
af0ffb2a5a
Add URL_REQUEST_* script constants
2010-05-03 00:15:55 +01:00
0fa57cac3f
Fix sensor cone for sensing avatars
2010-05-03 00:54:24 +02:00
7e74291176
Make the IUserAccountData properly unpack the god mode data, so grid gods
...
work again
2010-05-02 23:36:00 +01:00
cbb297bc79
Renamed HGInventoryBroker2 to HGInventoryBroker.
2010-05-02 10:37:57 -07:00
052580ef44
Deleted HGInventoryBroker, so that the new one can take its name.
2010-05-02 10:32:47 -07:00
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
5f6e9e6ab9
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-05-02 08:18:33 -04:00
7ad36d3d75
Adding DebugEvent Trap
...
Adding XMREEvent Trap
trapDebug("Modulename" ,"My data here ", scene);
trapXMRE(int data, string Message, Scene scene);
2010-05-02 08:15:12 -04:00
881fcb7def
Allow retrieval if admin users in scope mode
2010-04-30 23:32:58 +02:00
0c2ab54d41
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 21:13:31 +01:00
f1164161b3
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 22:22:40 +01:00
f3662e3d15
minor: eliminate more debug Console.WriteLines, convert one to logging instead
2010-04-30 22:22:03 +01:00
d0accc0732
Allow retrieval if admin users in scope mode
2010-04-30 21:13:03 +01:00
7ae55f6248
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:29 +01:00
0a9c98e7c4
Fix linking issue introduced in my earlier commit
2010-04-30 20:18:08 +01:00
177048a651
Fix linking issue introduced in my earlier commit
2010-04-30 20:16:21 +01:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
3e30de7430
Fix linking issue introduced in my earlier commit
2010-04-30 22:35:07 +02:00
23282935f1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 19:29:21 +01:00
5fda81e6bb
* XInventory fairly tested, including for HG. Almost ready to switch.
...
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
d1fcd22173
Fix a null ref from trying to access a dictionary that was never initialized.
2010-04-30 19:28:44 +01:00
d921329799
take out some debug logging in the sqlite db adaptor
2010-04-30 18:18:21 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
486ab82c02
Fix some symbol errors
2010-04-30 12:08:37 +01:00
0ea908291d
Fix some symbol errors
2010-04-30 12:08:08 +01:00
10750421a3
Fix some symbol errors
2010-04-30 12:07:47 +01:00
9500ba2ff5
Fix some symbol errors
2010-04-30 12:06:58 +01:00
13960b3b86
Merge branch 'master' into careminster-presence-refactor
2010-04-30 11:49:24 +01:00
7dc5ebc929
Merge branch 'careminster' into careminster-presence-refactor
2010-04-30 11:49:16 +01:00
8b70477556
Merge branch '0.6.9-post-fixes' into careminster
2010-04-30 11:48:57 +01:00
04845c1898
Fix link security issue
2010-04-30 11:48:09 +01:00
4cc06ff993
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-30 11:47:24 +01:00
22b3217113
Fix link security issue
2010-04-30 11:46:50 +01:00
9c79fd6308
Treat a UserLevel of -1 as an unverified account and refer them to their
...
activation email.
2010-04-30 05:33:45 +01:00
638dc8d3c2
Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.
2010-04-29 20:09:11 -07:00
f3c21524be
Fix Av jump motion S/W
2010-04-29 19:41:08 -04:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
f06772a088
Merge branch 'careminster' into careminster-presence-refactor
2010-04-29 23:33:20 +01:00
6a4fae123a
Started redoing HGInventoryBroker for XInventory and with multi-protocol in mind. Unfinished.
2010-04-29 11:39:13 -07:00
5c23b4aa56
Fix vertical attractor
2010-04-29 13:50:11 -04:00
aba5db9ed4
Merge branch 'minor-stuff'
2010-04-28 19:38:29 +01:00
2c595227b0
Commented verbose debug messages from XInventory handler.
2010-04-28 07:41:16 -07:00
be1141f0f7
Refactoring in Migration.cs: "using()" instead of explicit Dispose()
...
This ensures that 'cmd' gets disposed on errors
2010-04-28 13:40:35 +03:00
b49e9eff56
Fixed comments in Migration.cs: wrong argument order (no change to code)
2010-04-28 13:11:42 +03:00
aa56953411
Compiler.cs contained method GetCompilerOutput which, apparently,
...
was not used, but exactly the same path was calculated inline.
This patch does some minor refactoring by replacing inline path
calculation with GetCompilerOutput. This doesn't actually affect anything,
just minor prettifying of the code
2010-04-28 12:52:36 +03:00
8b75302a1e
Just a bit of spellchecking in the comments
2010-04-28 12:21:39 +03:00
806a2555f5
Spelling in FriendsModule.cs: "filed to load" -> "failed to load"
2010-04-28 11:49:53 +03:00
fb7458be31
Minor spelling corrections in MiniModule: "RetreiveAsset" changed to
...
"RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
2010-04-28 11:47:07 +03:00
423ff3b94b
Removed unused var from InventoryService.cs (-1 warning)
2010-04-28 11:47:03 +03:00
c54bc5094d
Putting it back to protected; Melanie doesn't like it to be public.
2010-04-27 18:52:15 -07:00
044c1cf5f6
Changed GetToken from protected to public. This is not exposed at the interface.
2010-04-27 18:37:34 -07:00
e838776920
* Thanks cmickeyb, for a patch that sanity checks if the response from m_Database.GetAsset(assetID) is null in AssetService.cs
2010-04-27 17:13:54 -07:00
59ac792e44
* Thanks cmickeyb, for a patch that corrects an invalid construction of Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
2010-04-27 17:11:24 -07:00
3f9d38538e
XInventory connector/handler showing signs of life. Tested, but needs more testing.
2010-04-27 11:01:56 -07:00
8a32ee7dd2
Merge branch 'careminster' into careminster-presence-refactor
2010-04-27 03:58:43 +01:00
89a003c6fc
Merge branch 'master' into careminster-presence-refactor
2010-04-27 03:57:36 +01:00
a92ca3c2c9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-27 03:49:25 +01:00
76e87181b2
RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet.
2010-04-26 20:28:37 -07:00
1e743eab6d
Allow a client to pass a scope id to log into in the login XML / LLSD
2010-04-27 03:48:49 +01:00
edde0be0a0
Fix build break.
2010-04-27 01:11:14 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
06661708b4
Add a parameter to prim inventory update to prevent event firing
2010-04-27 02:40:30 +02:00
6928ec0240
Add a parameter to prim inventory update to prevent event firing
2010-04-27 00:25:29 +01:00
31d040dc1e
Better error message.
2010-04-26 17:40:00 -07:00
2ac00b7f96
* Commenting SQLiteNG out of prebuild.xml, because it's making compile fail in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from!
...
* IRegionModule.cs wants to be committed too -- EOF.
2010-04-26 14:52:22 -07:00
81ff5eaba0
Make scripted attachment states work. Finally. Also replace two monitor locks
...
with RWLocks, hunting the 10^3 bug. Not successful, but needed to be done anyway
2010-04-25 22:03:35 +02:00
899d521ab4
Use the saved script states
2010-04-24 18:59:34 +02:00
27b3f23ff3
Remove some usings that stopped compilation
2010-04-24 16:53:47 +02:00
71f42f185a
Plumb a data path to initialize an attachment from an alternate source
2010-04-24 16:45:25 +02:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
6e99e5b47a
get region prim saving working properly in SQLiteNG
...
it wasn't working because of debug work that I'd forgotton to take out
2010-04-23 20:56:24 +01:00
f313d57fa4
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 20:11:26 +01:00
1b488c2581
dispose of the DbCommand used to execute migrations after we've finished with it rather than within the loop
...
disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
2010-04-23 20:08:24 +01:00
b5ec101cc8
add a comment about deprecating IRegionModule
2010-04-23 12:06:32 -07:00
e78f874cfd
put SQLiteNG classes in their own namespace to avoid confusion
2010-04-23 19:40:15 +01:00
56f60a04d9
Add an additional serialization call do the detach procedure. This call is
...
executed only for it's side effects, which are to block until attach(NULL_KEY)
completes, before commencing detachment.
2010-04-23 20:18:34 +02:00
fcbac43114
minor: correct the assembly information for SQLiteNG
2010-04-23 19:14:43 +01:00
5ee77886ac
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-23 19:05:32 +01:00
e84cc2f9db
Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
...
Include the library so that Windows builds correctly
It appears that Windows is okay with either SQLite or SQLiteNG
Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite
2010-04-23 18:56:50 +01:00
85646b157c
Adding some more SNMP events and some refactoring
...
Signed : The Masqued Foxi
2010-04-23 12:40:27 -04:00
a23bebdc0f
Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above
2010-04-23 17:17:15 +01:00
31e0704c8d
Remove debug output, the culprit has been identified
2010-04-23 17:48:50 +02:00
7eda9364fd
Adding LinkUp/LinkDown when a region is started or stoped.
...
Those two events could be used to compute the region availibility
2010-04-23 10:51:27 -04:00
780630d7c0
Fix a nullref in attachment handling. Add some debug to find the attachment
...
state issue
2010-04-23 14:41:20 +02:00
8692ac53f5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-22 18:56:06 -07:00
67990ea7e4
* Better error logging for failed SimianGrid web service calls
2010-04-22 18:55:31 -07:00
ebcc9874d4
Insert a ROLLBACK command on migration step failure. This ensures that
...
updating the Migrations table will not occur in a partial transaction, which
would be auto-rolled-back later.
2010-04-22 17:45:03 +01:00
e33209fe5b
Sanitized parsing of floats (x, y, z location) for Culture.
2010-04-22 08:47:47 -07:00
af778f09d5
Merge branch 'master' into careminster-presence-refactor
2010-04-21 19:51:17 +01:00
459323a931
Make the detection cone in attachments face in the direction of the avatar,
...
not the relative rotation of the attachment towards the avatar.
2010-04-21 19:44:19 +01:00
50f327ef5c
minor: change a comment and replace some magic numbers with the AssetType enum
2010-04-19 21:34:42 +01:00
6b963e73d9
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-19 21:28:30 +01:00
524a2a9e26
Make the "notecard saved" text appear in the saver rather than the notecard owner, if the notecard is saved by a permitted group member
...
This means moving the alert up to a place where the IClientAPI is available.
One can also argue that such client messages shouldn't be sent directly from the scene data model
2010-04-19 21:25:59 +01:00
da83ee28be
If a transfer request is received for a task inventory item asset, then route the permissions request through the existing CanEditScript() and CanEditNotecard() methods.
...
This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions.
Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts.
For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code
This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
2010-04-19 21:02:36 +01:00
855eda844f
log problems when an asset request through the UDP TransferRequest channel goes wrong
2010-04-19 20:06:55 +01:00
de63b60748
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 19:27:45 +02:00
80024c023a
Remove the event trigger for the attach event from the attachment module.
...
The script engine already triggers this internally.
2010-04-19 18:44:21 +02:00
af3e477e4b
Avoid duplicate script resumes. Move resume calls to more logical places
2010-04-19 17:28:43 +01:00
d2e4f2d376
Merge branch 'master' into careminster-presence-refactor
2010-04-19 15:33:20 +01:00
3e63ce6d9d
Make script asset fetches synchronous. Script instantiation synchronization
...
will not work if the instance is not created when the method returns.
2010-04-19 15:29:35 +01:00
a89208b465
Stopgap measure. Disable the recent script startup changes until I can cure the
...
race condition.
2010-04-19 14:14:31 +01:00
1667a29c88
And some more rez modes that weren't covered before
2010-04-19 12:54:33 +02:00
689b647790
And some more rez modes that weren't covered before
2010-04-19 10:54:41 +01:00
efa7873ae1
Merge branch 'master' into careminster-presence-refactor
2010-04-19 10:44:01 +01:00
b39db7e9e4
Also enable scripts rezzed into prims
2010-04-19 10:43:25 +01:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00
21cad5d3ac
All scripts are now created suspended and are only unsuspended when the object
...
is fully rezzed and all scripts in it are instantiated. This ensures that link
messages will not be lost on rez/region crossing and makes heavily scripted
objects reliable.
2010-04-19 06:29:26 +01:00
72d380acf0
Merge branch 'master' into careminster-presence-refactor
2010-04-19 06:10:23 +02:00
68a4f897b4
This GetScriptErrors() change allows initial XEngine to run in background
...
thread. It should block only for the case of being called by
CapsUpdateTaskInventoryScriptAsset().
2010-04-18 19:19:16 -04:00
4e1cbd1bf3
One more bug fix in sqlite sql statements.
2010-04-16 18:04:20 -07:00
2597a3406c
Bug fix: UserAccounts in SQLite was missing the primary key constraint.
2010-04-16 17:43:15 -07:00
930d374525
Expose Delete at IUserAccountData interface. It was there already. No changes in IUserAccountService, just the data layer.
2010-04-16 16:36:44 -07:00
26e3884237
refactor: move DeatchObject() into the AttachmentsModule
2010-04-17 00:00:45 +01:00
ab3af43d5e
refactor: remove now unused internal method SendAttachEvent()
2010-04-16 23:29:36 +01:00
cac12eca79
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-16 23:24:34 +01:00
57c293d604
refactor: crudely move DetachSingleAttachmentToGround() over to the AttachmentsModule
2010-04-16 23:15:13 +01:00
b3e9dd4fc2
Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL statements.
2010-04-16 15:10:57 -07:00
45563e20e0
minor: correctly print out missing item id when it can't be found rather than a NullReferenceException
2010-04-16 22:57:44 +01:00
17d023ba5b
refactor: crudely move the RezMultipleAttachments() method into the AttachmentsModule
2010-04-16 22:54:25 +01:00
e9926d13cf
minor: use the static ascii and utf8 encodings instead of instantiating our own
2010-04-16 22:38:42 +01:00
bf3956aeb0
Add --skip-assets option to load oar.
...
This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker.
This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
2010-04-16 22:29:11 +01:00
cf46735856
add a missing initialization of the m_memoryCache in XmlRpcGroupsServicesConnectorModule
...
the lack of this caused me a NullReferenceException when calling some groups methods directly though in principle it would also fail in other situations
2010-04-16 21:39:27 +01:00
5459a90fc6
minor: stop irc bridge warning about not attached to regions if it's not been turned on in the first place
2010-04-16 21:23:01 +01:00
9131a0d4a4
minor: stop datasnapshot issuing a warning log message if it's disabled
2010-04-16 21:12:09 +01:00
48f3733963
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:43:23 +01:00
c77444a821
Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserServer.exe fails on startup if no previous config
...
probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
2010-04-16 20:40:01 +01:00
ccc56e6dd4
Merge branch 'master' into careminster-presence-refactor
2010-04-16 05:20:25 +02:00
a7449a82bc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 19:49:02 -07:00
8fa13e3871
Patch from mcortez to add basic caching to the groups module. This prevents database/network explosions when you have a significant number of group-owned prims in a scene
2010-04-14 19:48:40 -07:00
ff50a90a83
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-04-14 19:23:17 -07:00
407b48f3bb
The missing .csproj for the Robust 32 bit launcher
2010-04-14 19:22:48 -07:00
e0f8362e7a
minor: add some documentation around the asset udp request path and replace some magic numbers with libomv enums
2010-04-14 22:31:11 +01:00
985faf4151
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-14 11:06:07 -07:00
1e87fc8a26
Applying a patch from lkalif to fix a small bug in the previous patch
2010-04-14 11:05:28 -07:00
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
1636f535ba
Committing sacha's partial work (from orpheus). The GridBrat needs to learn
...
a bit of git
2010-04-14 10:42:14 +01:00
6892fc41f7
Applying patch from lkalif to add support for inventory links to the SimianGrid connectors
2010-04-13 18:59:05 -07:00
54a5b6f434
Reduce number of AvatarAnimations sent with large number of avatars
2010-04-13 18:50:08 -07:00
fac55bc78b
Change ISnmpModule to use scene references
2010-04-14 01:17:27 +01:00
4433f53f72
Drop unused Alert() method from ISnmpModule
2010-04-13 20:14:56 +01:00
9920e219dd
Merge branch 'careminster' into careminster-presence-refactor
2010-04-13 04:36:08 +01:00
a1c4585a39
Merge branch '0.6.9-post-fixes' into careminster
2010-04-13 04:13:26 +01:00
3d0860ae61
thanks lkalif for Mantis #4676 - a patch that adds support for inventory links
...
Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com>
2010-04-12 17:10:51 -07:00
9b6e89457c
Fixed LINEAR_MOTOR Z drive, Mantis #30
2010-04-11 14:12:01 -04:00
7ecd9b3f1a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
...
resolved
Conflicts:
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
2010-04-10 23:52:10 +02:00
c6ba50b7e2
Adding ColdStart event
2010-04-10 23:39:06 +02:00
0b2b2daf23
guarantee that a script engine's GetScriptErrors() will not be called
...
until after its OnRezScript() returns so that script compile error
messages can be retrieved
2010-04-10 14:43:26 -04:00
58dac970af
re-fixing this darn file
2010-04-10 18:05:08 +02:00
c4eaf195b5
dding this deleted file...
2010-04-10 17:59:08 +02:00
d975bd8e5c
Fixing Trap
2010-04-10 17:51:51 +02:00
56c176f0a3
minor - add some documentation to PrimitiveBaseShape constructor with OpenMetaverse.Primitive parameter
2010-04-09 19:59:58 -07:00
7701ea2798
Add Scene.SnmpService, which is of type ISnmpModule and, if nun-null, can
...
be used to send snmp alerts
2010-04-09 06:49:14 +01:00
54cedfe432
Changed the GetTextureModule backport to work with the 0.6.9 codebase
2010-04-08 15:57:57 -07:00
c4c4c3696e
Backported WebUtil.cs from master to 0.6.9-postfixes to fix the build break
2010-04-08 15:26:51 -07:00
0f3314c04c
Backported GetTextureModule and IAssetService.GetCached()
2010-04-08 15:00:01 -07:00
3f6c4c150e
* Adds IAssetService.GetCached() to allow asset fetching from the local cache only
...
* Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer
* Sanity check for null reference in LLClientView.RefreshGroupMembership()
2010-04-08 12:31:44 -07:00
d834a2c3da
Implement cmGetAvatarList(). This returns a strided list of all avatars in the region, including their UUID, position and name. The radar is often the most taxing scripts on a sim, this function can help radars reduce their impact by 66% by eliminating the need for sensors.
2010-04-07 23:53:08 +02:00
e80e04c5fd
Increase the amount of time we wait for a teleport to complete. This allows teleportation to a remote region without a local connection to the asset server without timing out.
2010-04-07 22:59:13 +02:00
542abb9c43
* Fixing incorrect documentation for the continuation passing style IAssetService.Get() method
...
* Changing the SimianGrid asset service connector to match the corrected documentation
2010-04-07 09:58:16 -07:00
309f440fc0
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL. ( http://bugs.meta7.com/view.php?id=13 )
2010-04-07 10:13:47 +02:00
db5ea850f6
Fix llLookAt so that it doesn't "roll" the object and more closely imitates the behaviour in SL. ( http://bugs.meta7.com/view.php?id=28 )
2010-04-07 09:49:11 +02:00
20e3de1f0a
Add CHANGED_REGION_START (alias for CHANGED_REGION_RESTART as per LL Jira SVC-3773)
2010-04-07 08:28:57 +02:00
335c1b4420
Implement PSYS_SRC_INNERANGLE and PSYS_SRC_OUTERANGLE
2010-04-07 07:48:26 +02:00
5fc9fe70af
Added NullInventoryData for unit tests and quick try-outs of the services in 64-bit machines (no SQLite).
2010-04-06 19:38:01 -07:00
a97a887ea4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:25:46 -04:00
80346ad2e2
* May fix mantis #4603 .
...
* My local git wants to commit the groups files for line endings, I'm gonna let it do it.
2010-04-05 19:56:03 -07:00
f302224caf
* In the async asset fetch method, cache check before firing any async code. This should alleviate some "thread storm" issues when regions are starting up that hit Mono especially hard
2010-04-05 14:52:25 -07:00
e40acda6c8
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 23:22:14 +02:00
e7be131b89
Add the ISnmpModule interface definition to Careminster release
2010-04-05 23:20:56 +02:00
fd4a059e9b
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-04-05 23:17:31 +02:00
2f454843d8
Fix up my own shoddy code! Fixes prim rez break. Whups!
2010-04-05 23:17:06 +02:00
a573b5767b
Test commit
2010-04-05 22:31:30 +02:00
5c04d768a6
Bump version number
2010-04-05 22:26:18 +02:00
4bf1598930
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 16:15:23 -04:00
07b4889eab
Merge branch 'master' of ssh://TOR/var/git/careminster
2010-04-05 22:11:11 +02:00
7a3bb266eb
This commit adds some randomness to object persistence. It's a Work In Progress, I am working on improving this to a tiered approach.
2010-04-05 22:11:05 +02:00
f34cc6b469
Add a much cheaper agent count retrieval method. This is obsoleted by 0.7 so it can be reverted then.
2010-04-05 22:08:34 +02:00
48d2e8309a
check group membership and powers with the groups module rather than just the client's active group id
...
this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
2010-04-05 20:44:19 +01:00
9b9e2a8c71
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 15:27:13 -04:00
1be19c7f42
log exceptions that end up at the top of a asynchronous viewer packet method call rather than swallowing them
2010-04-05 19:46:43 +01:00
2fbbc13c71
Fix some overlooked merge conflicts that got committed
2010-04-05 19:42:15 +01:00
9ecad50419
Partially implement share with group option for object inventory items
...
If serverside permissions are off then this works as expected. Previously, it was impossible for more than one person to edit such items even if permissions were off.
If serverside permissions are on then this works as expected if the object was created by an avatar who had the required group active.
However, if the group for the object is later set then the contained item is still not editable. This may be linked to a wider bug where the object is still not modifiable by the group anyway
2010-04-05 19:37:02 +01:00
35bf75a77a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-04-05 14:08:57 -04:00
ba31b31ed0
Merge branch 'careminster' into careminster-presence-refactor
2010-04-05 18:22:15 +01:00
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
f505c1d0a4
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-04-05 18:10:49 +01:00
04a68db195
Merge branch '0.6.9-post-fixes' into careminster
2010-04-05 18:10:36 +01:00
e2a521742a
ChODE Only: Corrected Heightmap load to iliminate crack at 255M. Added 'fence' option to prevent physical objects crossing region border.
2010-04-04 22:57:32 -04:00
956225f0e1
Fixed Ban and parcel exclusion. Need to fix the parcel chat too
2010-04-04 18:29:18 +02:00
dc58c985e8
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-04 02:24:52 +01:00
936e08e20e
Patch from mcortez. This appears to be a huge change to the groups module
...
and I can't say if this is beneficial or destructive due to the way it
was delivered (zipfile). Pushing this on faith alone.
2010-04-04 02:23:53 +01:00
e6ed9b6747
* Guard against null in last commit
2010-04-03 18:12:03 -07:00
cfa941adc7
Last commit was too fast... must override.
2010-04-03 12:14:57 -07:00
8f68edfe12
* Fail storing user accounts in the remote connector.
2010-04-03 12:11:54 -07:00
6485c576a1
* Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
...
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
35c82a31db
Don't append ACKs to zerocoded packets. Although this should fine in theory, I'm seeing the viewer ignore or fail to parse ACKs appended to our zerocoded packets. This should cut down on viewer->sim resend traffic
2010-04-02 16:25:14 -07:00
a895de4414
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-04-02 13:32:40 -07:00
4c9cc56624
* Better logging for Authenticate() failures
...
* Changed a warning message to debug when fetching user sessions
2010-04-02 13:32:30 -07:00
a004d88bf3
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-04-02 14:53:52 +01:00
4b98d0db92
Adding the groups update (Mantis #4646 )
...
Thanks, mcortez.
2010-04-02 14:53:33 +01:00
e0eba26f7b
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-01 23:59:00 +01:00
938905df1e
oops, add file missing from last commit
...
refactor out redundant method from GroupsMessagingModule
2010-04-01 22:45:01 +01:00
c33b1de9df
expose methods that allow region modules to send messages to groups
2010-04-01 22:37:20 +01:00
08ba34da03
First attempt at fixing mantis #4641 . It's better but there are now some issues with permissions.
...
(looks like my commit is going to touch CM files, I'm going to let it do it - eof only)
2010-03-31 21:30:44 -07:00
2bf1761ad8
When saving an oar/iar, don't attempt to write out the data byte array if it's empty
...
On Mono 2.6 (and probably before) this causes a non-obvious IOException
2010-03-31 19:51:17 +01:00
21519d3311
Add missing licenses. Change relicensed LightShare module to proper BSD
...
licensing.
2010-03-31 13:33:18 +01:00
4fefd05839
Merge branch 'master' into careminster-presence-refactor
...
Remerge the LightShare bits that were pushed to core
2010-03-31 04:38:19 +01:00
19ae5e5dbb
Adding the LightShare module and scripting API. This code was written by
...
TomMeta and was contributed by Meta7.
2010-03-31 04:23:51 +01:00
ec637e2b8c
Committing the LightShare code, which was developed by TomMeta of Meta7.
...
This allows scripts to set WindLight parameters for clients connecting
to a region. Currently, this is only supported by the Meta7 viewer.
2010-03-31 04:20:20 +01:00
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
8cb81bdc9b
minor: commented out code removal
2010-03-30 17:06:30 +01:00
696d711d15
Completely prevent full update packets being sent after kill object packets
...
If a full update is sent after the kill, the object remains as in the linden viewer but in an undeletable and unowned state until relog
This patch prevents this by recording kills in LLClientView
2010-03-30 17:04:26 +01:00
24fc4703d0
fix build break. First argument of GetGroupRecord is not a uuid
2010-03-29 22:02:02 +01:00
e7e56e0143
Remove a redundant method body
2010-03-29 19:50:24 +01:00
607ed61ec2
Stab one bug. When joining an estate with a new region, make sure it's also
...
used on first run and not only later.
2010-03-28 23:18:25 +01:00
efc0916a01
May fix mantis #4613
2010-03-27 22:48:15 -07:00
1430441cf3
Change the SimianGrid connector log messages to start with "[SIMIAN " to avoid configuration confusion
2010-03-26 15:13:55 -07:00
d6a64bf732
* Catch exceptions thrown when MySQLEstateData.LinkRegion() is called. This won't fix the bug I'm seeing with regions not realizing they are already part of an estate, but it will fix the OpenSim crash if that situation ever comes up
2010-03-26 13:50:25 -07:00
c6bbb48f2b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-03-26 13:14:32 -07:00
8ee0bdb86e
Minor improvement on debug message.
2010-03-26 13:13:33 -07:00
9fb17e7ab2
Select Random Region if Home or Last cant be found
2010-03-26 13:06:26 -07:00
05123c6bd5
* Fixed a dictionary value retrieval in GroupsModule
2010-03-26 12:39:22 -07:00
3e8cb7a9a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-26 12:21:24 -07:00
5a2315c68c
* Fixed a bug with null value handling in WebUtil.BuildQueryString()
...
* Changed the null check back in estate manager setup but fixed the case for an existing account being found
* Implemented SetPassword() in the SimianGrid auth connector
2010-03-26 12:21:05 -07:00
dd544f811a
switch flavor to RC1
2010-03-26 19:09:09 +00:00
4565e5dfbc
change trunk version to 0.7.Dev
2010-03-26 18:56:05 +00:00
dd1c1b3bcd
Fixed a backwards null check that was preventing estate owner from being set and a misleading error message (in grid mode it tries to get a user, not create one)
2010-03-26 11:08:14 -07:00
87fe96ae2c
replace recent IModule.GetGroup() with better GetGroupRecord(string name)
2010-03-26 00:10:29 +00:00
857918d3b0
minor: some debugging information and spacing changes to group module
2010-03-25 23:53:05 +00:00
f0703cad2c
add get group by name method to IGroupsModule
2010-03-25 22:47:52 +00:00
19c659ca99
fix unit tests broken by commit dcf18689b9
...
can't prompt for estate owner in unit tests
2010-03-25 21:46:23 +00:00
bfbf25c542
minor: Print out port that http servers are using
...
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
e0b287961f
Change land overlay to send group owned status properly
2010-03-23 17:04:37 +01:00
3fb73e4e26
UNTESTED SQLite code to enable estate setup in interactive confguration
2010-03-23 02:18:55 +00:00
dcf18689b9
First stage of the new interactive region creation. This will allow creation
...
of a region and joining it to an existing estate or creating a new estate,
as well as creating an estate owner if in standalone, and assigning estate
owners. In Grid mode, existing users must be used. MySQL ONLY!!!! so far, as
I can't develop or test for either SQLite or MSSQL.
2010-03-23 02:05:56 +00:00
07a6b37001
Somehow the starting estate number in MySQL was lost. This adds a migration
...
to start estates at 100. Existing databases having autcreated estates below
100 will see a gap in estate numbering. Other database implementors need to
ensure that no estates with numbers less that 100 are autocreated, unless
they are prepared to deal with the viewer's built-in notions of
Linden Mainland
2010-03-22 20:38:27 +00:00
d378c758e1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-03-22 18:51:07 +00:00
70b0e07d1e
Remove the reading of estate_settings.xml and the associated processing of
...
defaults. Adding code to facilitate estate creation / managemment as part of
first time start up
2010-03-22 18:49:56 +00:00
9a781e793a
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
...
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
f020bd3206
Fix a nullref in permissions when returning objects via right-click
2010-03-20 15:49:39 +00:00
0f5fb6f190
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-03-19 19:14:09 -04:00
add47befac
Update acceleration to 0 on no tphysical.
2010-03-19 18:53:16 -04:00
5e65bef805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-19 15:17:15 -07:00
62e0b53ca4
Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files.
2010-03-19 15:16:44 -07:00
859bc717a4
Cleaned up access to scenepresences in scenegraph. GetScenePresences and GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>).
2010-03-19 15:16:35 -07:00
0e36994fe7
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2010-03-19 13:27:12 -04:00
3ea72eeabb
Fix sit with autopilot.
2010-03-19 13:26:34 -04:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
46d990419b
Merge branch 'careminster' into careminster-presence-refactor
2010-03-18 20:00:58 +00:00
e0289bb432
Flesh out the new permission method
2010-03-18 19:58:21 +00:00
69b5ddceda
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:56 +00:00
1a2cbbc8c1
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2010-03-18 18:58:44 +00:00
f35eb8819c
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:58:37 +00:00
734b0416de
Unify a previous refactor of object return with the older solution. We
...
really don't need two methods doing the same thing, but differently.
2010-03-18 18:57:29 +00:00
Melanie