diff options
| author | Melanie | 2010-03-09 22:46:17 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-09 22:46:17 +0000 |
| commit | 40873504dcde19a3738cf4d3a4928a59b811e8f0 (patch) | |
| tree | 605d2c2575e21496b05eeabd0a5755b8fa788efd /OpenSim/Region/OptionalModules | |
| parent | - parcel blocking, region crossing blocking, teleport blocking (diff) | |
| parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
| download | opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.zip opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.gz opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.bz2 opensim-SC-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
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 711052c..f5b148f 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
| @@ -1680,5 +1680,9 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
| 1680 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1680 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1681 | { | 1681 | { |
| 1682 | } | 1682 | } |
| 1683 | |||
| 1684 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1685 | { | ||
| 1686 | } | ||
| 1683 | } | 1687 | } |
| 1684 | } | 1688 | } |
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs index ebf9333..338c04b 100644 --- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs +++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs | |||
| @@ -1160,5 +1160,9 @@ namespace OpenSim.Region.OptionalModules.World.NPC | |||
| 1160 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) | 1160 | public void SendChangeUserRights(UUID agentID, UUID friendID, int rights) |
| 1161 | { | 1161 | { |
| 1162 | } | 1162 | } |
| 1163 | |||
| 1164 | public void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId) | ||
| 1165 | { | ||
| 1166 | } | ||
| 1163 | } | 1167 | } |
| 1164 | } | 1168 | } |