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

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2022-01-29 18:28:33 +00:00
parent 6d595dbccd
commit fc8c08ec8a
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs
View File

@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
protected override void ProcessRequest(IOSHttpRequest httpRequest, IOSHttpResponse httpResponse)
{
if (m_FriendsModule == null)
if (m_FriendsModule == null || m_FriendsModule.Scene == null)
{
httpResponse.StatusCode = (int)HttpStatusCode.NotImplemented;
return;

16
OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs
View File

@@ -179,11 +179,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{
if (finfo.TheirFlags != -1)
{
UUID id;
if (!UUID.TryParse(finfo.Friend, out id))
if (!UUID.TryParse(finfo.Friend, out UUID id))
{
string url = string.Empty, first = string.Empty, last = string.Empty, tmp = string.Empty;
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp))
if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out string url, out string first, out string last, out string tmp))
{
// m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend);
uMan.AddUser(id,first,last, url);
@@ -305,8 +303,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
return true;
// fid is not a UUID...
string url = string.Empty, tmp = string.Empty, f = string.Empty, l = string.Empty;
if (Util.ParseUniversalUserIdentifier(fid, out agentID, out url, out f, out l, out tmp))
if (Util.ParseUniversalUserIdentifier(fid, out agentID, out string url, out string f, out string l, out string tmp))
{
if (!agentID.Equals(UUID.Zero))
{
@@ -516,13 +513,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends
{
friendUUI = finfo.Friend;
theFriendUUID = friendUUI;
UUID utmp = UUID.Zero;
string url = String.Empty;
string first = String.Empty;
string last = String.Empty;
// If it's confirming the friendship, we already have the full UUI with the secret
if (Util.ParseUniversalUserIdentifier(theFriendUUID, out utmp, out url, out first, out last, out secret))
if (Util.ParseUniversalUserIdentifier(theFriendUUID, out UUID utmp, out string url,
out string first, out string last, out secret))
{
agentUUID = agentUUI + ";" + secret;
m_uMan.AddUser(utmp, first, last, url);

4
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@@ -176,10 +176,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
bool foreigner = false;
if (UserManagementModule != null) // foreign user
{
url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
foreigner = !UserManagementModule.IsLocalGridUser(toAgentID);
if(foreigner)
url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
}
Util.FireAndForget(delegate
{
UUID toDelAgentID = new UUID(im.toAgentID);