diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs index a895d6e..032e55a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs | |||
@@ -93,7 +93,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
93 | { | 93 | { |
94 | string deadAvatarMessage; | 94 | string deadAvatarMessage; |
95 | ScenePresence killingAvatar = null; | 95 | ScenePresence killingAvatar = null; |
96 | string killingAvatarMessage; | 96 | // string killingAvatarMessage; |
97 | 97 | ||
98 | if (killerObjectLocalID == 0) | 98 | if (killerObjectLocalID == 0) |
99 | deadAvatarMessage = "You committed suicide!"; | 99 | deadAvatarMessage = "You committed suicide!"; |
@@ -118,14 +118,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule | |||
118 | deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, deadAvatar.Scene.GetUserName(part.OwnerID)); | 118 | deadAvatarMessage = String.Format("You impaled yourself on {0} owned by {1}!", part.Name, deadAvatar.Scene.GetUserName(part.OwnerID)); |
119 | else | 119 | else |
120 | { | 120 | { |
121 | killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name); | 121 | // killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name); |
122 | deadAvatarMessage = String.Format("You got killed by {0}!", killingAvatar.Name); | 122 | deadAvatarMessage = String.Format("You got killed by {0}!", killingAvatar.Name); |
123 | } | 123 | } |
124 | } | 124 | } |
125 | } | 125 | } |
126 | else | 126 | else |
127 | { | 127 | { |
128 | killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name); | 128 | // killingAvatarMessage = String.Format("You fragged {0}!", deadAvatar.Name); |
129 | deadAvatarMessage = String.Format("You got killed by {0}!", killingAvatar.Name); | 129 | deadAvatarMessage = String.Format("You got killed by {0}!", killingAvatar.Name); |
130 | } | 130 | } |
131 | } | 131 | } |