Commit Graph

12557 Commits (9bc5098dd8cac09caab5d50045aba13110ead2c6)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 304c626824 Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2010-03-03 17:51:23 +00:00
Justin Clark-Casey (justincc) 1c68ad2bba remove references to OpenSim.Framework.Commuications.Tests.dll since all relevant test code has been obsoleted
this allows the tests to pass on my local system
2010-03-03 17:50:05 +00:00
Diva Canto d83b86e4bf Fixed prebuild errors that have emerged with the merge 2010-03-03 09:34:51 -08:00
Diva Canto aee887afaf Added empty service URLs upon account creation. 2010-03-03 09:16:21 -08:00
Diva Canto 9fda5c51ac More debug. 2010-03-02 22:20:44 -08:00
Diva Canto d167686adb Better error handling on PasswordAuthenticationService 2010-03-02 21:12:53 -08:00
Diva Canto 13f0e4a718 * Better debug message on login problems.
* Moved GridInfoService config to OpenSim.Server.ini
2010-03-02 20:17:25 -08:00
Melanie 7ec1a3fcad Merge branch 'master' into careminster-presence-refactor 2010-03-03 03:18:19 +00:00
Melanie 028a87fe37 Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
Melanie 01c4bb4a5e Revert "test"
This reverts commit 2f0011c605.
2010-03-03 01:29:42 +00:00
Melanie 2f0011c605 test 2010-03-03 01:26:19 +00:00
Diva Canto 14073831d2 Fixes Region.Framework tests. Although these tests don't fail, they need to be rewritten, because they are doing agent manipulations in the wrong way, so they're fairly meaningless. 2010-03-02 07:53:52 -08:00
Diva Canto 763285aaf1 Fixed SQL tests. 2010-03-02 07:29:41 -08:00
Melanie a9580ebb49 Merge branch 'presence-refactor' 2010-03-02 05:23:55 +00:00
Diva Canto cb6c371a85 Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor 2010-03-01 22:23:52 -08:00
Diva Canto 00e6739b7d Offline friendship offers now working. 2010-03-01 22:21:33 -08:00
Diva Canto 53a8286468 Changed the query in GetFriends in SQLite to match the one in MySql. 2010-03-01 21:35:46 -08:00
Diva Canto c6a5ff26ff Friends rights under control. 2010-03-01 21:32:55 -08:00
Melanie 2d1d55e9bc Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim 2010-03-02 05:21:49 +00:00
Melanie bef311dfb9 Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
2010-03-02 04:46:13 +00:00
Melanie 581056eaf3 Merge branch 'master' into presence-refactor 2010-03-02 04:43:36 +00:00
Diva Canto cfaf087b89 More work on GrantRights. Still not right. 2010-03-01 09:23:33 -08:00
Jeff Ames 780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Jeff Ames a5f78ac604 Formatting cleanup. 2010-03-01 11:59:22 +09:00
Melanie b8d89ac6da Fix -1 checks for login case 2010-03-01 02:57:25 +00:00
Melanie dc22e74033 Small tweak 2010-03-01 02:54:18 +00:00
Melanie 38ea1dd5c8 Merge branch 'master' into presence-refactor 2010-03-01 01:01:32 +00:00
Melanie 65fadd2f67 Should have things the right way around, better that way 2010-03-01 00:20:34 +00:00
Melanie bfcc57c071 Change friends to handle offers as it was originally designed. This may
need to be changed in SQLite & MSSQL as well
2010-03-01 00:02:14 +00:00
Melanie 18727235a0 Merge branch 'presence-refactor' of melanie@opensimulator.org:/var/git/opensim into presence-refactor 2010-02-28 23:26:38 +00:00
Diva Canto 774958bbbf Added FriendsData to both Null storage and SQLite. Untested. 2010-02-28 16:09:06 -08:00
Melanie adb9cc2af9 Implement rights changes locall (UNTESTED) 2010-02-28 23:26:13 +00:00
Melanie 86c621fdc7 Change the signature of SendChangeUserRights, because we have to send
this to both parties
2010-02-28 22:56:31 +00:00
Melanie 44e7224b86 Add missing ChangeUserRights packet sender 2010-02-28 22:47:31 +00:00
Diva Canto 5c5966545d Initial Online friends notification seems to be working reliably now. All this needs more testing, but everything is there. 2010-02-28 12:07:38 -08:00
Diva Canto db24e57cab Friends connectors finished. Status notification working across the board. One last bug: friends online upon login are not being sent to the user. 2010-02-28 08:36:13 -08:00
Diva Canto 1daabc3473 Status notification (online/offline) working for same sim. 2010-02-27 18:16:31 -08:00
Diva Canto 593fd54fc7 Update the local cache upon friendship acceptance. Logout notifications working. 2010-02-27 11:23:31 -08:00
Diva Canto a234672db8 * Finished implementation of FriendsService.Delete
* Deny now working
2010-02-27 10:57:57 -08:00
Diva Canto 3906a14857 Friends online notifications upon friendship now working (same sim only). 2010-02-27 10:24:55 -08:00
Melanie a4472ceeac Implement the requestonlinenotification method 2010-02-27 15:50:41 +00:00
Melanie 0ab65899e4 Move requestonlinenotification generic message to presence module 2010-02-27 15:37:00 +00:00
Melanie 6f770af5fb Implement a handler for requestonlinenotification generic message 2010-02-27 15:25:51 +00:00
Diva Canto de5c2801e8 Friendships established. 2010-02-27 08:14:37 -08:00
Diva Canto 25870e8049 * Friendship offers starting to work in the same sim. Not quite right yet.
* Added skeleton for out Connectors/Friends/FriendsSimConnector.cs
* Moved request handler to its own file
2010-02-26 20:35:45 -08:00
Diva Canto dc88dc2c3d More flesh to FriendsModule. Still incomplete. 2010-02-26 17:33:08 -08:00
Melanie dfc17a531f Add the client message handlers. The calling card handlers that are part of
the old friends module are omitted intentionally, as I believe those should
be in a calling card module, not bundled with friends.
2010-02-26 21:37:07 +00:00
Diva Canto 2c6606cee4 Removed unnecessary debug message 2010-02-26 10:46:13 -08:00
Diva Canto bbb43f9bde Now showing friends online upon grid login. 2010-02-26 10:35:23 -08:00
Justin Clark-Casey (justincc) 93967d4a1c fix bug where region settings loaded via an oar (water height, terrain textures, etc.) were not being persisted to the database
this meant that the loaded settings would disappear after a restart
2010-02-26 18:30:05 +00:00