aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorMic Bowman2011-11-02 17:11:10 -0700
committerMic Bowman2011-11-02 17:11:10 -0700
commit99a347ee11d8fd807a765bb0ce2ed89e811baab2 (patch)
tree972a46394ccdac8ea9abd51f63742418969c71b0 /OpenSim/Region/Framework
parentfix CopyTo call that was breaking under mono 2.10 (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC-99a347ee11d8fd807a765bb0ce2ed89e811baab2.zip
opensim-SC-99a347ee11d8fd807a765bb0ce2ed89e811baab2.tar.gz
opensim-SC-99a347ee11d8fd807a765bb0ce2ed89e811baab2.tar.bz2
opensim-SC-99a347ee11d8fd807a765bb0ce2ed89e811baab2.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f012d72..dff43fd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1494,7 +1494,7 @@ namespace OpenSim.Region.Framework.Scenes
1494 msg.fromAgentName = "Server"; 1494 msg.fromAgentName = "Server";
1495 msg.dialog = (byte)19; // Object msg 1495 msg.dialog = (byte)19; // Object msg
1496 msg.fromGroup = false; 1496 msg.fromGroup = false;
1497 msg.offline = (byte)1; 1497 msg.offline = (byte)0;
1498 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID; 1498 msg.ParentEstateID = RegionInfo.EstateSettings.ParentEstateID;
1499 msg.Position = Vector3.Zero; 1499 msg.Position = Vector3.Zero;
1500 msg.RegionID = RegionInfo.RegionID.Guid; 1500 msg.RegionID = RegionInfo.RegionID.Guid;