mirror of
https://github.com/OpenSim-NGC/OpenSim-Sasquatch.git
synced 2024-11-21 06:26:09 -07:00
llCloud is obsolete, remove rest on old viewer V! cloud support
This commit is contained in:
parent
f447a58ac9
commit
50212c240c
3 changed files with 1 additions and 47 deletions
|
@ -175,7 +175,7 @@ namespace OpenSim.Region.CoreModules.Framework
|
||||||
{
|
{
|
||||||
foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
|
foreach (KeyValuePair<uint, Caps> kvp in m_capsObjects)
|
||||||
{
|
{
|
||||||
if (kvp.Value.AgentID == agentId)
|
if (agentId.Equals(kvp.Value.AgentID))
|
||||||
{
|
{
|
||||||
m_scene.EventManager.TriggerOnDeregisterCaps(agentId, kvp.Value);
|
m_scene.EventManager.TriggerOnDeregisterCaps(agentId, kvp.Value);
|
||||||
m_capsObjects.Remove(kvp.Key);
|
m_capsObjects.Remove(kvp.Key);
|
||||||
|
|
|
@ -1,37 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (c) Contributors, http://opensimulator.org/
|
|
||||||
* See CONTRIBUTORS.TXT for a full list of copyright holders.
|
|
||||||
*
|
|
||||||
* Redistribution and use in source and binary forms, with or without
|
|
||||||
* modification, are permitted provided that the following conditions are met:
|
|
||||||
* * Redistributions of source code must retain the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer.
|
|
||||||
* * Redistributions in binary form must reproduce the above copyright
|
|
||||||
* notice, this list of conditions and the following disclaimer in the
|
|
||||||
* documentation and/or other materials provided with the distribution.
|
|
||||||
* * Neither the name of the OpenSimulator Project nor the
|
|
||||||
* names of its contributors may be used to endorse or promote products
|
|
||||||
* derived from this software without specific prior written permission.
|
|
||||||
*
|
|
||||||
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
|
|
||||||
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
|
|
||||||
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
namespace OpenSim.Region.Framework.Interfaces
|
|
||||||
{
|
|
||||||
public interface ICloudModule
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Retrieves the cloud density at the given region coordinates
|
|
||||||
/// </summary>
|
|
||||||
float CloudCover(int x, int y, int z);
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1454,15 +1454,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
|
|
||||||
public LSL_Float llCloud(LSL_Vector offset)
|
public LSL_Float llCloud(LSL_Vector offset)
|
||||||
{
|
{
|
||||||
ICloudModule module = World.RequestModuleInterface<ICloudModule>();
|
|
||||||
if (module is not null)
|
|
||||||
{
|
|
||||||
Vector3 pos = m_host.GetWorldPosition();
|
|
||||||
int x = (int)(pos.X + offset.x);
|
|
||||||
int y = (int)(pos.Y + offset.y);
|
|
||||||
|
|
||||||
return module.CloudCover(x, y, 0);
|
|
||||||
}
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue