diff options
| author | Melanie | 2012-08-31 01:32:18 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-31 01:32:18 +0100 |
| commit | 1b15144208d925bf1fe6c545616b533faf8945ea (patch) | |
| tree | a7720bb8c2ddcdc1470cf991e26c62b2b1a46be9 /OpenSim/Region/ClientStack/Linden | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Replace SendBannedUserList with Avination's version. Untested in core. Not ev... (diff) | |
| download | opensim-SC_OLD-1b15144208d925bf1fe6c545616b533faf8945ea.zip opensim-SC_OLD-1b15144208d925bf1fe6c545616b533faf8945ea.tar.gz opensim-SC_OLD-1b15144208d925bf1fe6c545616b533faf8945ea.tar.bz2 opensim-SC_OLD-1b15144208d925bf1fe6c545616b533faf8945ea.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index 2dcc9cb..7e51638 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||
| @@ -4525,7 +4525,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 4525 | { | 4525 | { |
| 4526 | returnblock[j] = new EstateOwnerMessagePacket.ParamListBlock(); | 4526 | returnblock[j] = new EstateOwnerMessagePacket.ParamListBlock(); |
| 4527 | } | 4527 | } |
| 4528 | j = 0; | 4528 | j = 0; |
| 4529 | 4529 | ||
| 4530 | returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++; | 4530 | returnblock[j].Parameter = Utils.StringToBytes(estateID.ToString()); j++; |
| 4531 | returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++; | 4531 | returnblock[j].Parameter = Utils.StringToBytes(((int)Constants.EstateAccessCodex.EstateBans).ToString()); j++; |