aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
diff options
context:
space:
mode:
authorKitto Flora2010-03-12 13:48:31 -0500
committerKitto Flora2010-03-12 13:48:31 -0500
commit7bd48d383d3383c1e633f76f76a5291f4224d48a (patch)
tree18997a5b1a123091af18a1a7984d7dd7873930ac /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parentDynamics Integration Part 1 (diff)
parentSmall consistency change (diff)
downloadopensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.zip
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.gz
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.bz2
opensim-SC-7bd48d383d3383c1e633f76f76a5291f4224d48a.tar.xz
Resolved merge
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index cc38a30..85e3fb3 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -774,6 +774,8 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
774 public event UUIDNameRequest OnTeleportHomeRequest; 774 public event UUIDNameRequest OnTeleportHomeRequest;
775 public event ScriptAnswer OnScriptAnswer; 775 public event ScriptAnswer OnScriptAnswer;
776 public event AgentSit OnUndo; 776 public event AgentSit OnUndo;
777 public event AgentSit OnRedo;
778 public event LandUndo OnLandUndo;
777 public event ForceReleaseControls OnForceReleaseControls; 779 public event ForceReleaseControls OnForceReleaseControls;
778 public event GodLandStatRequest OnLandStatRequest; 780 public event GodLandStatRequest OnLandStatRequest;
779 public event DetailedEstateDataRequest OnDetailedEstateDataRequest; 781 public event DetailedEstateDataRequest OnDetailedEstateDataRequest;