aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorMelanie Thielker2009-01-09 02:59:56 +0000
committerMelanie Thielker2009-01-09 02:59:56 +0000
commit7c7ea57c5c2bf01280e2df03cedc999aa5e7be87 (patch)
tree73f90c8e9e362f7055bccf31af83fe332ce2f9ab /OpenSim/Region/Environment
parent* Adds the variables passed to the hashtable BaseHttpServer passes in. (diff)
downloadopensim-SC_OLD-7c7ea57c5c2bf01280e2df03cedc999aa5e7be87.zip
opensim-SC_OLD-7c7ea57c5c2bf01280e2df03cedc999aa5e7be87.tar.gz
opensim-SC_OLD-7c7ea57c5c2bf01280e2df03cedc999aa5e7be87.tar.bz2
opensim-SC_OLD-7c7ea57c5c2bf01280e2df03cedc999aa5e7be87.tar.xz
Finish dwell sending, adding the forgotten method body.
Add UserInfo and a dummy reply to enable Hippo Viewer users to disable IM logging (option was greyed out in OpenSim before)
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 2b91391..d06f35a 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -204,7 +204,6 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
204 public event ViewerEffectEventHandler OnViewerEffect; 204 public event ViewerEffectEventHandler OnViewerEffect;
205 205
206 public event FetchInventory OnAgentDataUpdateRequest; 206 public event FetchInventory OnAgentDataUpdateRequest;
207 public event FetchInventory OnUserInfoRequest;
208 public event TeleportLocationRequest OnSetStartLocationRequest; 207 public event TeleportLocationRequest OnSetStartLocationRequest;
209 208
210 public event UpdateShape OnUpdatePrimShape; 209 public event UpdateShape OnUpdatePrimShape;
@@ -357,6 +356,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
357 356
358 public event ParcelDwellRequest OnParcelDwellRequest; 357 public event ParcelDwellRequest OnParcelDwellRequest;
359 358
359 public event UserInfoRequest OnUserInfoRequest;
360 public event UpdateUserInfo OnUpdateUserInfo;
361
360#pragma warning restore 67 362#pragma warning restore 67
361 363
362 #endregion 364 #endregion
@@ -1045,6 +1047,10 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
1045 { 1047 {
1046 } 1048 }
1047 1049
1050 public void SendUserInfoReply(bool imViaEmail, bool visible, string email)
1051 {
1052 }
1053
1048 #endregion 1054 #endregion
1049 } 1055 }
1050} 1056}