diff options
| author | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-08-18 23:15:25 +0100 |
| commit | 8c12f22140d2885bb79aa4e201345ae6fd45fec6 (patch) | |
| tree | e6d3fd25eafdee7f790f54d092e8494be4715149 /OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | |
| parent | Add textures no longer shipped with newer viewers to OpenSim's standard asset... (diff) | |
| parent | Prevent a bad cast in llCreateLink(). (diff) | |
| download | opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.zip opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.gz opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.bz2 opensim-SC_OLD-8c12f22140d2885bb79aa4e201345ae6fd45fec6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs index 53a2a7d..e9bcae3 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs | |||
| @@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue | |||
| 158 | info.Add("SimAccess", OSD.FromInteger(simAccess)); | 158 | info.Add("SimAccess", OSD.FromInteger(simAccess)); |
| 159 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); | 159 | info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes())); |
| 160 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); | 160 | info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port)); |
| 161 | info.Add("TeleportFlags", OSD.FromBinary(1L << 4)); // AgentManager.TeleportFlags.ViaLocation | 161 | info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation |
| 162 | 162 | ||
| 163 | OSDArray infoArr = new OSDArray(); | 163 | OSDArray infoArr = new OSDArray(); |
| 164 | infoArr.Add(info); | 164 | infoArr.Add(info); |