diff options
| author | John Hurliman | 2010-03-07 16:05:12 -0800 |
|---|---|---|
| committer | John Hurliman | 2010-03-07 16:05:12 -0800 |
| commit | d71ed7081b2267ff056927c97ac8ef32466f7b96 (patch) | |
| tree | d5308dc67cde3e7aa5c3d323598b49c449529a31 /OpenSim/Region/OptionalModules | |
| parent | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit syst... (diff) | |
| parent | Bug fix: correct name of methods in user accounts connector. (diff) | |
| download | opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.zip opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.gz opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.bz2 opensim-SC_OLD-d71ed7081b2267ff056927c97ac8ef32466f7b96.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/OptionalModules')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index 96530a1..f2253f2 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1679,5 +1679,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1679 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1679 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1680 | { | 1680 | { |
| 1681 | } | 1681 | } |
| 1682 | |||
| 1683 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1684 | { | ||
| 1685 | } | ||
| 1682 | } | 1686 | } |
| 1683 | } | 1687 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index f8ab8d8..65445d9 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -1159,5 +1159,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 1159 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1159 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1160 | { | 1160 | { |
| 1161 | } | 1161 | } |
| 1162 | |||
| 1163 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1164 | { | ||
| 1165 | } | ||
| 1162 | } | 1166 | } |
| 1163 | } | 1167 | } |