ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source
This commit is contained in:
Melanie
2012-07-01 03:04:23 +01:00
parent 6137f37028 1926de5a05
commit e5eef139ed
12 changed files with 22 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Services/HypergridService/GatekeeperService.cs
View File

@@ -370,8 +370,6 @@ namespace OpenSim.Services.HypergridService
return false;
}
}
return false;
}
// Check that the service token was generated for *this* grid.

26
OpenSim/Services/HypergridService/HGFriendsService.cs
View File

@@ -276,19 +276,19 @@ namespace OpenSim.Services.HypergridService
}
}
// Lastly, let's notify the rest who may be online somewhere else
foreach (string user in usersToBeNotified)
{
UUID id = new UUID(user);
//m_UserAgentService.LocateUser(id);
//etc...
//if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
//{
// string url = m_TravelingAgents[id].GridExternalName;
// // forward
//}
//m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
}
// // Lastly, let's notify the rest who may be online somewhere else
// foreach (string user in usersToBeNotified)
// {
// UUID id = new UUID(user);
// //m_UserAgentService.LocateUser(id);
// //etc...
// //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
// //{
// // string url = m_TravelingAgents[id].GridExternalName;
// // // forward
// //}
// //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
// }
// and finally, let's send the online friends
if (online)

4
OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
View File

@@ -57,7 +57,7 @@ namespace OpenSim.Services.HypergridService
private string m_HomeURL;
private IUserAccountService m_UserAccountService;
private UserAccountCache m_Cache;
// private UserAccountCache m_Cache;
private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
@@ -92,7 +92,7 @@ namespace OpenSim.Services.HypergridService
// Preferred
m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
}
m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting...");