Commit Graph

1267 Commits

Author SHA1 Message Date
Melanie
ba38c697e8 Merge branch 'master' into careminster-presence-refactor 2010-06-27 20:05:55 +01:00
Tom Grimshaw
ef0ac7c403 Deal with incoming land objects properly so they don't just stack up 2010-06-26 23:20:28 -07:00
Tom Grimshaw
592ff1288d Add a new global event : OnTerrainUpdate 2010-06-26 18:51:19 -07:00
Tom Grimshaw
c97e9f8621 Reverting the ITerrainModule changes. Turns out this was useless. 2010-06-26 18:43:01 -07:00
Tom Grimshaw
3bcee57e3e add HasChanged to ITerrainModule 2010-06-26 17:34:19 -07:00
Tom Grimshaw
c3e806a2ea Add a new accessor for the TerainModule : "HasChanged" 2010-06-26 17:25:45 -07:00
Justin Clark-Casey (justincc)
a4a808818f don't report the null uuid as a missing asset on saving oars/iars 2010-06-25 21:48:19 +01:00
Melanie Thielker
8a0ec60c8f Unhook the dwell request from the land module (and therefore local storage) 2010-06-25 01:41:00 +02:00
Melanie Thielker
cbca58401a Add the object owner UUID into the binary bucket of object to user IM 2010-06-24 20:46:24 +02:00
Melanie Thielker
2cc1f14b0c Replace the imSessionID, which is useless out of context, with the scope id
in saved IMs
2010-06-24 19:37:02 +02:00
Melanie Thielker
b012e963d7 New viewers don't set the "save offline IM" flag anymore. Set it serverside
so messages get saved
2010-06-24 18:48:40 +02:00
Melanie Thielker
6c37a02c0f bug fix. 0,0 is a vlid sim coordinate 2010-06-24 06:02:44 +02:00
Melanie Thielker
854a8b9172 Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 23:39:25 +01:00
Melanie Thielker
5c02fb435d Security fix: Allow only textures to be fetched using HTTP texture cap 2010-06-22 17:35:00 +02:00
Melanie Thielker
95c763201f Set the offline flag in inventory offers 2010-06-20 06:36:46 +02:00
Diva Canto
24a68e36fb Bug fix: wrong name of requester in local friendship offer. 2010-06-19 12:32:36 -07:00
Melanie
04b60aa490 Merge branch 'master' into careminster-presence-refactor 2010-06-19 20:32:01 +01:00
Melanie
891214c65b Merge branch 'master' into careminster-presence-refactor 2010-06-18 20:49:21 +01:00
Justin Clark-Casey (justincc)
71c8bbaf2c Fix problem where iar load would duplicate huge number of folders
This was http://opensimulator.org/mantis/view.php?id=4770
Extend unit tests to check for this scenario too
2010-06-18 17:37:28 +01:00
Justin Clark-Casey (justincc)
11a35d8cda change TestPartExistingIarPath() to check appropriate folder creation
change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
2010-06-18 17:10:16 +01:00
Justin Clark-Casey (justincc)
cf4721a92d in IAR utils, return all folders that match a particular path rather than just the first one 2010-06-18 16:33:34 +01:00
Tom Grimshaw
ef1496ca2d Add "alert dialog" for sending dialogs to users from the console 2010-06-14 04:28:38 -07:00
Diva Canto
19558f380a Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to neighbours. 2010-06-13 19:06:22 -07:00
Melanie
fdf648bcf3 Merge branch 'master' into careminster-presence-refactor 2010-06-14 02:49:15 +01:00
Diva Canto
66619b5996 Added checks for failed UpdateAgent calls. 2010-06-12 12:08:45 -07:00
Melanie
5e4bee0f34 Merge branch 'master' into careminster-presence-refactor 2010-06-12 19:15:59 +01:00
Diva Canto
e6efe34b4c * Added CHANGED_TELEPORT event trigger upon inter-sim teleports.
* Cleaned up NewUserConnection.
2010-06-12 11:11:13 -07:00
Melanie Thielker
4c58ac2c90 Make local teleports send CHANGED_TELEPORT 2010-06-12 07:35:03 +01:00
Melanie Thielker
e337c9130f Make local teleports send CHANGED_TELEPORT 2010-06-12 07:34:22 +02:00
Melanie
836728e5de Merge branch 'master' into careminster-presence-refactor 2010-06-12 00:08:20 +01:00
John Hurliman
b5bc2816fc Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-11 15:43:22 -07:00
John Hurliman
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
Melanie
c61e998580 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-11 22:09:24 +01:00
Justin Clark-Casey (justincc)
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
Melanie
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
8531da37d4 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-06-11 21:18:53 +01:00
Justin Clark-Casey (justincc)
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
Diva Canto
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
Melanie
4e34770aba Merge branch 'master' into careminster-presence-refactor 2010-06-11 20:56:43 +01:00
Diva Canto
d184fef4dc Inventory offers and subsequent notifications of acceptance/decline now working across the board. 2010-06-11 12:47:47 -07:00
Melanie
1cfebca48d Merge branch 'master' into careminster-presence-refactor 2010-06-11 20:35:00 +01:00
Melanie
aa2f5bdd77 Merge branch 'master' into careminster-presence-refactor 2010-06-11 17:46:29 +01:00
Diva Canto
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
Diva Canto
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
Diva Canto
e80cb815df Bug fix on attachments: attach->drop->attach works now. 2010-06-09 12:51:24 -07:00
Melanie
1dce243661 Merge branch 'master' into careminster-presence-refactor 2010-06-09 20:25:05 +01:00
Diva Canto
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
Diva Canto
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
Melanie
6b2d2413f7 Merge branch 'master' into careminster-presence-refactor 2010-06-09 16:48:37 +01:00