Melanie
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
Justin Clark-Casey (justincc)
828e4a5b09
Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
2011-11-15 20:26:42 +00:00
Justin Clark-Casey (justincc)
64784bc0cf
remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead
2011-11-15 17:30:58 +00:00
Justin Clark-Casey (justincc)
430821d837
Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFriends() to reflect their intended function
2011-11-15 16:12:35 +00:00
Justin Clark-Casey (justincc)
2b5b4ac167
refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better reflect its actual function
2011-11-15 16:05:08 +00:00
Justin Clark-Casey (justincc)
50803dfe2c
For clients that are entering a simulator from initial login, stop executing FriendsModule.FetchFriendslist() asychronously.
...
Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated.
Changing this to synchronous may improve issues where a user does not see friends as online even though they are.
I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
2011-11-15 15:57:53 +00:00
Justin Clark-Casey (justincc)
8d0aaa359f
refactor: Don't create a new UUID for passing uuids to client - UUIDs are structs are so not passed by reference (and they're immutable!)
2011-11-15 15:05:10 +00:00
Justin Clark-Casey (justincc)
89632f3ea8
Add test for removing a friendship.
2011-11-14 20:56:56 +00:00
Melanie
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
Melanie
17f32b7773
Fix build break
2011-11-14 20:33:39 +00:00
Justin Clark-Casey (justincc)
e5ff7f389b
Improved method doc for AddFriend() - it actually does set up a two-way relationship.
...
Rename IFriendsModule.AddFriend() to AddFriendship()
2011-11-14 20:31:16 +00:00
Melanie
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
Justin Clark-Casey (justincc)
a64def8b73
minor: remove some mono compiler warnings
2011-11-14 18:16:14 +00:00
Justin Clark-Casey (justincc)
348d15707d
Add test for adding a friend whilst online
2011-11-14 18:08:02 +00:00
Justin Clark-Casey (justincc)
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
Melanie
08fcf958c2
Port the Avination offline messaging system to Core
2011-11-02 23:50:47 +00:00
Melanie
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc)
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Justin Clark-Casey (justincc)
36e2054760
minor: temporarily comment out the local status notify friends messages seen on login/logout, since it's a bit noisy on the console.
...
Please uncomment if/when this is still needed.
2011-06-27 23:12:54 +01:00
Melanie
1b7fec0842
Remove friends debug spam
2011-06-20 03:20:32 +02:00
Melanie
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
Diva Canto
3307db5d4a
This hopefully fixes all issues with online/offline notifications across grids. http://opensimulator.org/mantis/view.php?id=5528
2011-06-07 19:36:04 -07:00
Diva Canto
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
Diva Canto
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
Diva Canto
58c53c41de
Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work.
2011-05-21 16:48:00 -07:00
Diva Canto
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
Diva Canto
7592a033df
Moved 3 request handlers from OpenSim.Framework.Servers.HttpServer up to OpenSim.Framework -- just pasted them in WebUtil. This is so that code that uses the Service connectors don't need to include the HttpServer dll -- that was odd.
2011-04-12 20:24:28 -07:00
Melanie
07cc032081
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-03 19:42:46 +00:00
Melanie
5432dfd53a
Allow cross-scope friendships to work, and also allow other cross scope name
...
resolution
2011-01-02 01:29:22 +01:00
Melanie
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
Melanie
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
Jeff Ames
bc9f793a92
Formatting cleanup.
2010-10-04 21:28:17 -04:00
root
7762301cea
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:57:26 +01:00
root
251f2444d0
Revert "* Changed 11 calls for session info to the more optimized API method"
...
This reverts commit 5dc9ea2f24
2010-09-17 01:50:48 +02:00
Melanie
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
John Hurliman
8415b98806
Over a dozen thread safety fixes in FriendsModule
2010-09-09 14:45:10 -07:00
John Hurliman
5dc9ea2f24
* Changed 11 calls for session info to the more optimized API method
2010-09-08 15:08:49 -07:00
Melanie
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +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
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
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
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
Melanie
c5878b6610
Merge branch 'master' into careminster-presence-refactor
2010-06-04 21:11:15 +01:00
Diva Canto
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
Melanie Thielker
eb5a95d26b
Prevent an "index out of range" error on login
2010-05-18 03:02:36 +02:00
