aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/World
diff options
context:
space:
mode:
authorMelanie2010-03-09 22:46:17 +0000
committerMelanie2010-03-09 22:46:17 +0000
commit40873504dcde19a3738cf4d3a4928a59b811e8f0 (patch)
tree605d2c2575e21496b05eeabd0a5755b8fa788efd /OpenSim/Region/OptionalModules/World
parent- parcel blocking, region crossing blocking, teleport blocking (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.zip
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.gz
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.bz2
opensim-SC_OLD-40873504dcde19a3738cf4d3a4928a59b811e8f0.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/OptionalModules/World')
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
1 files changed, 4 insertions, 0 deletions
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}