aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
diff options
context:
space:
mode:
authorMelanie2012-02-04 11:48:20 +0000
committerMelanie2012-02-04 11:48:20 +0000
commitce5e900721cb0447f76bcb198faf5f7c31eeaf6e (patch)
treec906a2b8858f9c590e39e2a26f47017fd7b6b9c6 /OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server
parentMerge branch 'master' into careminster (diff)
parentAdd default value to TelehubObject (diff)
downloadopensim-SC-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.zip
opensim-SC-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.gz
opensim-SC-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.bz2
opensim-SC-ce5e900721cb0447f76bcb198faf5f7c31eeaf6e.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server')
-rw-r--r--OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
index 8fe3199..7d7c5c5 100644
--- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
+++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
@@ -1250,7 +1250,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
1250 1250
1251 } 1251 }
1252 1252
1253 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, string abuseEmail, UUID estateOwner) 1253 public void SendDetailedEstateData(UUID invoice, string estateName, uint estateID, uint parentEstate, uint estateFlags, uint sunPosition, UUID covenant, uint covenantChanged, string abuseEmail, UUID estateOwner)
1254 { 1254 {
1255 1255
1256 } 1256 }