mirror of
https://github.com/opensim/opensim.git
synced 2026-08-08 02:05:34 +08:00
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ff2d47b1a3 |
@@ -2242,7 +2242,7 @@ namespace OpenSim.Region.ClientStack.Linden
|
|||||||
foreach (UserData ud in names)
|
foreach (UserData ud in names)
|
||||||
{
|
{
|
||||||
// dont tell about unknown users, we can't send them back on Bad either
|
// dont tell about unknown users, we can't send them back on Bad either
|
||||||
if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unknown"))
|
if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unkown"))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
string fullname = ud.FirstName + " " + ud.LastName;
|
string fullname = ud.FirstName + " " + ud.LastName;
|
||||||
|
|||||||
@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
|
|||||||
if (killingAvatar == null)
|
if (killingAvatar == null)
|
||||||
{
|
{
|
||||||
IUserManagement userManager = deadAvatar.Scene.RequestModuleInterface<IUserManagement>();
|
IUserManagement userManager = deadAvatar.Scene.RequestModuleInterface<IUserManagement>();
|
||||||
string userName = "Unknown User";
|
string userName = "Unkown User";
|
||||||
if (userManager != null)
|
if (userManager != null)
|
||||||
userName = userManager.GetUserName(part.OwnerID);
|
userName = userManager.GetUserName(part.OwnerID);
|
||||||
deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, userName);
|
deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, userName);
|
||||||
|
|||||||
@@ -346,7 +346,7 @@ namespace OpenSim.Services.Connectors
|
|||||||
sendData["LastName"] = last;
|
sendData["LastName"] = last;
|
||||||
sendData["Password"] = password;
|
sendData["Password"] = password;
|
||||||
if (!string.IsNullOrEmpty(email))
|
if (!string.IsNullOrEmpty(email))
|
||||||
sendData["Email"] = first;
|
sendData["Email"] = email;
|
||||||
sendData["ScopeID"] = scopeID.ToString();
|
sendData["ScopeID"] = scopeID.ToString();
|
||||||
|
|
||||||
return SendAndGetReply(sendData);
|
return SendAndGetReply(sendData);
|
||||||
|
|||||||
Reference in New Issue
Block a user