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
9318674cdb
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:54:35 +01:00
9648f08dc9
Add the AllowLightShareFunctions example
2010-06-11 17:53:49 +01:00
77ef0053f2
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-06-11 17:52:59 +01:00
8a084cb7e1
Remove a company name referecne from the example
2010-06-11 17:52:29 +01:00
de8f9e201f
Merge branch 'master' into careminster-presence-refactor
2010-06-11 17:49:12 +01:00
c98b10fc8c
Remove the cm* function namespace
2010-06-11 17:48:41 +01: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
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
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
Melanie