Merge pull request #47 from holoneon/patch-5

Update CombatModule.cs - typo

OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs

@@ -2242,7 +2242,7 @@ namespace OpenSim.Region.ClientStack.Linden
                     foreach (UserData ud in names)
                     {
                         // dont tell about unknown users, we can't send them back on Bad either
-                        if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unkown"))
+                        if (string.IsNullOrEmpty(ud.FirstName) || ud.FirstName.Equals("Unknown"))
                             continue;
 
                         string fullname = ud.FirstName + " " + ud.LastName;
@@ -2643,4 +2643,4 @@ namespace OpenSim.Region.ClientStack.Linden
             }
         }
     }
-}
+}

OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs

@@ -125,7 +125,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
                         if (killingAvatar == null)
                         {
                             IUserManagement userManager = deadAvatar.Scene.RequestModuleInterface<IUserManagement>();
-                            string userName = "Unkown User";
+                            string userName = "Unknown User";
                             if (userManager != null)
                                 userName = userManager.GetUserName(part.OwnerID);
                             deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, userName);