aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/IClientAPI.cs4
-rw-r--r--OpenSim/Framework/Util.cs3
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 848d574..c046010 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -1256,9 +1256,11 @@ namespace OpenSim.Framework
1256 void SendAttachedSoundGainChange(UUID objectID, float gain); 1256 void SendAttachedSoundGainChange(UUID objectID, float gain);
1257 1257
1258 void SendNameReply(UUID profileId, string firstname, string lastname); 1258 void SendNameReply(UUID profileId, string firstname, string lastname);
1259 void SendAlertMessage(string message);
1260 1259
1260 void SendAlertMessage(string message);
1261 void SendAlertMessage(string message, string into);
1261 void SendAgentAlertMessage(string message, bool modal); 1262 void SendAgentAlertMessage(string message, bool modal);
1263
1262 void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url); 1264 void SendLoadURL(string objectname, UUID objectID, UUID ownerID, bool groupOwned, string message, string url);
1263 1265
1264 /// <summary> 1266 /// <summary>
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 5250d30..96b91ff 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -382,7 +382,8 @@ namespace OpenSim.Framework
382 382
383 public static ulong RegionGridLocToHandle(uint X, uint Y) 383 public static ulong RegionGridLocToHandle(uint X, uint Y)
384 { 384 {
385 ulong handle = X << 40; // shift to higher half and mult by 256) 385 ulong handle = X;
386 handle <<= 40; // shift to higher half and mult by 256)
386 handle |= (Y << 8); // mult by 256) 387 handle |= (Y << 8); // mult by 256)
387 return handle; 388 return handle;
388 } 389 }