This cleans up a merge mess from the earlier checkin and implements llOwnerSay()

via the newly created Scene.SimBroadcast() call.
This commit is contained in:
Dr Scofield
2008-05-26 15:37:31 +00:00
parent 42cdf3c240
commit 1bb1d5d9b0
12 changed files with 126 additions and 90 deletions

View File

@@ -243,6 +243,11 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
m_LSL_Functions.llShout(channelID, text);
}
public void llOwnerSay(string msg)
{
m_LSL_Functions.llOwnerSay(msg);
}
public int llListen(int channelID, string name, string ID, string msg)
{
return m_LSL_Functions.llListen(channelID, name, ID, msg);
@@ -1617,11 +1622,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler.LSL
return m_LSL_Functions.llGetInventoryCreator(item);
}
public void llOwnerSay(string msg)
{
m_LSL_Functions.llOwnerSay(msg);
}
public void llRequestSimulatorData(string simulator, int data)
{
m_LSL_Functions.llRequestSimulatorData(simulator, data);

View File

@@ -272,19 +272,30 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
public void llWhisper(int channelID, string text)
{
World.SimChat(Helpers.StringToField(text),
ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
ChatTypeEnum.Whisper, channelID, m_host.AbsolutePosition,
m_host.Name, m_host.UUID, false);
}
public void llSay(int channelID, string text)
{
World.SimChat(Helpers.StringToField(text),
ChatTypeEnum.Say, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
ChatTypeEnum.Say, channelID, m_host.AbsolutePosition,
m_host.Name, m_host.UUID, false);
}
public void llShout(int channelID, string text)
{
World.SimChat(Helpers.StringToField(text),
ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition, m_host.Name, m_host.UUID);
ChatTypeEnum.Shout, channelID, m_host.AbsolutePosition,
m_host.Name, m_host.UUID, false);
}
public void llOwnerSay(string msg)
{
m_log.DebugFormat("llOwnerSay(\"{0}\")", msg);
World.SimChatBroadcast(Helpers.StringToField(text),
ChatTypeEnum.Owner, 0, m_host.AbsolutePosition,
m_host.Name, m_host.UUID, false);
}
public int llListen(int channelID, string name, string ID, string msg)
@@ -2032,11 +2043,6 @@ namespace OpenSim.Grid.ScriptEngine.DotNetEngine.Compiler
return "";
}
public void llOwnerSay(string msg)
{
NotImplemented("llOwnerSay");
}
public void llRequestSimulatorData(string simulator, int data)
{
NotImplemented("llRequestSimulatorData");