diff options
author | Adam Frisby | 2008-09-30 14:42:25 +0000 |
---|---|---|
committer | Adam Frisby | 2008-09-30 14:42:25 +0000 |
commit | d4c17512855c4fcf3bb76b8ad45e0de190687a90 (patch) | |
tree | d29107ed3706ed19fb0ca0f5e5cac11511dbffe9 | |
parent | Allow create-region to load files from arbitrary locations (diff) | |
download | opensim-SC_OLD-d4c17512855c4fcf3bb76b8ad45e0de190687a90.zip opensim-SC_OLD-d4c17512855c4fcf3bb76b8ad45e0de190687a90.tar.gz opensim-SC_OLD-d4c17512855c4fcf3bb76b8ad45e0de190687a90.tar.bz2 opensim-SC_OLD-d4c17512855c4fcf3bb76b8ad45e0de190687a90.tar.xz |
* Fixed minor issue while building: If you do a raytraced object placement and a target isn't found, the object is rezzed at 0,0,0 - instead now it will place according to the position sent by the client.
* We may instead want to abort and send a "Cannot Rez Here" message?
-rw-r--r-- | OpenSim/Framework/IClientAPI.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.cs | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs index 1c38011..ddd1cd3 100644 --- a/OpenSim/Framework/IClientAPI.cs +++ b/OpenSim/Framework/IClientAPI.cs | |||
@@ -342,8 +342,6 @@ namespace OpenSim.Framework | |||
342 | /// <summary> | 342 | /// <summary> |
343 | /// Returns the full name of the agent/avatar represented by this client | 343 | /// Returns the full name of the agent/avatar represented by this client |
344 | /// </summary> | 344 | /// </summary> |
345 | /// <param name="newPack"></param> | ||
346 | /// <param name="packType"></param> | ||
347 | string Name { get; } | 345 | string Name { get; } |
348 | 346 | ||
349 | bool IsActive | 347 | bool IsActive |
@@ -750,6 +748,7 @@ namespace OpenSim.Framework | |||
750 | 748 | ||
751 | void SendLogoutPacket(); | 749 | void SendLogoutPacket(); |
752 | ClientInfo GetClientInfo(); | 750 | ClientInfo GetClientInfo(); |
751 | |||
753 | void SetClientInfo(ClientInfo info); | 752 | void SetClientInfo(ClientInfo info); |
754 | void SetClientOption(string option, string value); | 753 | void SetClientOption(string option, string value); |
755 | string GetClientOption(string option); | 754 | string GetClientOption(string option); |
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs index 88da9be..bca1ff9 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.cs | |||
@@ -1608,6 +1608,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
1608 | if (ei.HitTF) | 1608 | if (ei.HitTF) |
1609 | { | 1609 | { |
1610 | pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); | 1610 | pos = new Vector3(ei.ipoint.X, ei.ipoint.Y, ei.ipoint.Z); |
1611 | } else | ||
1612 | { | ||
1613 | // fall back to our stupid functionality | ||
1614 | pos = RayEnd; | ||
1611 | } | 1615 | } |
1612 | 1616 | ||
1613 | return pos; | 1617 | return pos; |