OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into careminster

avinationmerge
Melanie 2010-01-09 15:34:58 +00:00
parent a764eb5dc7 332463ca94
commit 121c6b4835
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Constants.cs
View File

@ -36,10 +36,10 @@ namespace OpenSim.Framework
public enum EstateAccessCodex : uint public enum EstateAccessCodex : uint
{ {
AccessOptions = 17, AccessOptions = 1,
AllowedGroups = 18, AllowedGroups = 2,
EstateBans = 20, EstateBans = 4,
EstateManagers = 24 EstateManagers = 8
} }
[Flags]public enum TeleportFlags : uint [Flags]public enum TeleportFlags : uint

12
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -3918,7 +3918,17 @@ namespace OpenSim.Region.ClientStack.LindenUDP
returnblock[j].Parameter = Utils.StringToBytes("0"); j++; returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
returnblock[j].Parameter = Utils.StringToBytes("0"); j++; returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
returnblock[j].Parameter = Utils.StringToBytes("0"); j++; returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString()); j++; returnblock[j].Parameter = Utils.StringToBytes("0"); j++;
j = 2; // Agents
if ((code & 2) != 0)
j = 3; // Groups
if ((code & 8) != 0)
j = 5; // Managers
returnblock[j].Parameter = Utils.StringToBytes(Data.Length.ToString());
j = 6;
for (int i = 0; i < Data.Length; i++) for (int i = 0; i < Data.Length; i++)
{ {
returnblock[j].Parameter = Data[i].GetBytes(); j++; returnblock[j].Parameter = Data[i].GetBytes(); j++;