aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Client
diff options
context:
space:
mode:
authorMelanie2010-02-15 00:20:48 +0000
committerMelanie2010-02-15 00:20:48 +0000
commitc033223c63274ebe41075b24d108ca952fbd242c (patch)
tree8c969a9643c469feb37133b175be18eb52fdff49 /OpenSim/Client
parentExtraneous debug messages removed (diff)
parentPlug a small hole (diff)
downloadopensim-SC-c033223c63274ebe41075b24d108ca952fbd242c.zip
opensim-SC-c033223c63274ebe41075b24d108ca952fbd242c.tar.gz
opensim-SC-c033223c63274ebe41075b24d108ca952fbd242c.tar.bz2
opensim-SC-c033223c63274ebe41075b24d108ca952fbd242c.tar.xz
Merge branch 'master' into presence-refactor
Diffstat (limited to 'OpenSim/Client')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs2
-rw-r--r--OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs2
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs2
3 files changed, 6 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index 3143b6d..fcd16b8 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -698,6 +698,8 @@ namespace OpenSim.Client.MXP.ClientStack
698 public event UUIDNameRequest OnTeleportHomeRequest; 698 public event UUIDNameRequest OnTeleportHomeRequest;
699 public event ScriptAnswer OnScriptAnswer; 699 public event ScriptAnswer OnScriptAnswer;
700 public event AgentSit OnUndo; 700 public event AgentSit OnUndo;
701 public event AgentSit OnRedo;
702 public event LandUndo OnLandUndo;
701 public event ForceReleaseControls OnForceReleaseControls; 703 public event ForceReleaseControls OnForceReleaseControls;
702 public event GodLandStatRequest OnLandStatRequest; 704 public event GodLandStatRequest OnLandStatRequest;
703 public event DetailedEstateDataRequest OnDetailedEstateDataRequest; 705 public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
diff --git a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
index dda95a1..208065c 100644
--- a/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
+++ b/OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
@@ -343,6 +343,8 @@ namespace OpenSim.Client.Sirikata.ClientStack
343 public event UUIDNameRequest OnTeleportHomeRequest; 343 public event UUIDNameRequest OnTeleportHomeRequest;
344 public event ScriptAnswer OnScriptAnswer; 344 public event ScriptAnswer OnScriptAnswer;
345 public event AgentSit OnUndo; 345 public event AgentSit OnUndo;
346 public event AgentSit OnRedo;
347 public event LandUndo OnLandUndo;
346 public event ForceReleaseControls OnForceReleaseControls; 348 public event ForceReleaseControls OnForceReleaseControls;
347 public event GodLandStatRequest OnLandStatRequest; 349 public event GodLandStatRequest OnLandStatRequest;
348 public event DetailedEstateDataRequest OnDetailedEstateDataRequest; 350 public event DetailedEstateDataRequest OnDetailedEstateDataRequest;
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index 613da56..2b1b11f 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -347,6 +347,8 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
347 public event UUIDNameRequest OnTeleportHomeRequest = delegate { }; 347 public event UUIDNameRequest OnTeleportHomeRequest = delegate { };
348 public event ScriptAnswer OnScriptAnswer = delegate { }; 348 public event ScriptAnswer OnScriptAnswer = delegate { };
349 public event AgentSit OnUndo = delegate { }; 349 public event AgentSit OnUndo = delegate { };
350 public event AgentSit OnRedo = delegate { };
351 public event LandUndo OnLandUndo = delegate { };
350 public event ForceReleaseControls OnForceReleaseControls = delegate { }; 352 public event ForceReleaseControls OnForceReleaseControls = delegate { };
351 public event GodLandStatRequest OnLandStatRequest = delegate { }; 353 public event GodLandStatRequest OnLandStatRequest = delegate { };
352 public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { }; 354 public event DetailedEstateDataRequest OnDetailedEstateDataRequest = delegate { };