diff options
author | Melanie | 2013-05-30 21:48:09 +0100 |
---|---|---|
committer | Melanie | 2013-05-30 21:48:09 +0100 |
commit | 669fa3ff9ab911dc7ee686b47e49a65f67a0a809 (patch) | |
tree | 6ea7f58cc6365595281f823f3994d2d22299ee40 /OpenSim/Region/OptionalModules/Agent | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Try caching the user name for a new agent earlier on in the process of establ... (diff) | |
download | opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.zip opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.gz opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.bz2 opensim-SC_OLD-669fa3ff9ab911dc7ee686b47e49a65f67a0a809.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Agent')
-rw-r--r-- | OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs index f7b837c..b28d96b 100644 --- a/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs +++ b/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs | |||
@@ -1061,7 +1061,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1061 | { | 1061 | { |
1062 | } | 1062 | } |
1063 | 1063 | ||
1064 | public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance) | 1064 | public void SendMoneyBalance(UUID transaction, bool success, byte[] description, int balance, int transactionType, UUID sourceID, bool sourceIsGroup, UUID destID, bool destIsGroup, int amount, string item) |
1065 | { | 1065 | { |
1066 | 1066 | ||
1067 | } | 1067 | } |
@@ -1206,11 +1206,6 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server | |||
1206 | 1206 | ||
1207 | } | 1207 | } |
1208 | 1208 | ||
1209 | public bool AddMoney(int debit) | ||
1210 | { | ||
1211 | return true; | ||
1212 | } | ||
1213 | |||
1214 | public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition) | 1209 | public void SendSunPos(Vector3 sunPos, Vector3 sunVel, ulong CurrentTime, uint SecondsPerSunCycle, uint SecondsPerYear, float OrbitalPosition) |
1215 | { | 1210 | { |
1216 | 1211 | ||