Commit Graph

461 Commits

Author SHA1 Message Date
Melanie Thielker
d665f0ae66 Detach attachments displaced by other attachments 2010-07-14 20:46:26 +02:00
Melanie
0b74662ce2 Merge branch 'master' into careminster-presence-refactor 2010-07-14 19:53:15 +01:00
Melanie
e1ea82b329 Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:51:12 +01:00
Melanie Thielker
a7b5fe6a88 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:49:54 +01:00
Melanie Thielker
bebbe407ee Major attachments cleanup. Remove unused AttachObject ClientView method
Clean up use of AttachObject throughout, reduce number of overloads
and number of parameters
2010-07-14 19:58:23 +02:00
Melanie Thielker
0c445239a6 Remove useless quaternion parameter from AttachObject sig 2010-07-14 19:21:01 +02:00
Justin Clark-Casey (justincc)
71433075a9 Fix obvious bug in XInventoryService.GetFolderItems() which was preventing the iar module from being able to save single item iars 2010-07-14 17:12:12 +01:00
Melanie
eacf3d9221 Merge branch 'master' into careminster-presence-refactor 2010-07-13 20:46:21 +01:00
Justin Clark-Casey (justincc)
86f3f83250 uncomment a load iar code line I accidentally commented in the last commit
hooray for automated tests
2010-07-12 23:37:08 +01:00
Justin Clark-Casey (justincc)
3156f4bbeb comment out a lot of the debug log messages when loading an iar
these are very redundant now and cause issues when loading large iars
diva, you may want to cherry pick this for 0.7-post-fixes since it only comments out log lines and nothing else
2010-07-12 23:00:01 +01:00
Melanie Thielker
edcfaf60c9 Fix IMs the right way. This sets it up so that timestamps are actually
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
Melanie
ec73074aac Merge branch 'master' into careminster-presence-refactor 2010-07-02 03:02:53 +01:00
Justin Clark-Casey (justincc)
8326f36cda minor: comment out high volume texture serving module debug message 2010-06-30 22:07:28 +01:00
Melanie
46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Justin Clark-Casey (justincc)
eb30b60e52 minor: comment out high volume texture serving module debug message 2010-06-30 19:54:35 +01:00
Diva Canto
d123350164 One more bug fix in FriendsModule: GrantRights. One of the caches was not being updated. 2010-06-28 16:04:12 -07:00
Melanie Thielker
3e908023b2 Force IM timestamps to current server time to prevent "Saved on" headers
while the sender is online
2010-06-28 08:58:51 +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
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
Melanie
836728e5de Merge branch 'master' into careminster-presence-refactor 2010-06-12 00:08:20 +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
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
74d62901c8 Merge branch 'master' into careminster-presence-refactor 2010-06-07 00:44:36 +01:00
Diva Canto
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