diff options
author | Teravus Ovares | 2008-05-03 15:39:40 +0000 |
---|---|---|
committer | Teravus Ovares | 2008-05-03 15:39:40 +0000 |
commit | e8acb49fefc0e567510b4058b6571599a0158b62 (patch) | |
tree | d87243f8d596b6df07db190ba30bf2da4d608c18 /OpenSim/Framework | |
parent | * Committing some collision stuffs that I'm working on. (diff) | |
download | opensim-SC-e8acb49fefc0e567510b4058b6571599a0158b62.zip opensim-SC-e8acb49fefc0e567510b4058b6571599a0158b62.tar.gz opensim-SC-e8acb49fefc0e567510b4058b6571599a0158b62.tar.bz2 opensim-SC-e8acb49fefc0e567510b4058b6571599a0158b62.tar.xz |
* For your fragging desire, damage enabled land works, but watch out!, life does not regenerate until you're dead!
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 13 | ||||
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 1 |
2 files changed, 14 insertions, 0 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index ee0d164..2813aa0 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -259,6 +259,19 @@ namespace OpenSim.Framework.Communications | |||
259 | } | 259 | } |
260 | } | 260 | } |
261 | } | 261 | } |
262 | public string UUIDNameRequestString(LLUUID uuid) | ||
263 | { | ||
264 | UserProfileData profileData = m_userService.GetUserProfile(uuid); | ||
265 | if (profileData != null) | ||
266 | { | ||
267 | //LLUUID profileId = profileData.ID; | ||
268 | string firstname = profileData.FirstName; | ||
269 | string lastname = profileData.SurName; | ||
270 | |||
271 | return firstname + " " + lastname; | ||
272 | } | ||
273 | return "(hippos)"; | ||
274 | } | ||
262 | 275 | ||
263 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) | 276 | public List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID queryID, string query) |
264 | { | 277 | { |
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 8f41728..02dfc8c 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -729,6 +729,7 @@ namespace OpenSim.Framework | |||
729 | uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); | 729 | uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); |
730 | 730 | ||
731 | void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); | 731 | void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); |
732 | void SendHealth(float health); | ||
732 | 733 | ||
733 | byte[] GetThrottlesPacked(float multiplier); | 734 | byte[] GetThrottlesPacked(float multiplier); |
734 | 735 | ||