OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Working out merge errors with master

dsg
Dan Lake 2011-06-15 13:43:02 -07:00
parent 9c15c8897e
commit 8791e5dac0
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@ -222,6 +222,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
}); });
return; return;
}
//DSG: make this function public, so that we can call from outside to
//use the Grid Service to send the instant message.
public virtual void SendGridInstantMessageViaXMLRPC(GridInstantMessage im, MessageResultNotification result)
{
} }
protected bool SendIMToScene(GridInstantMessage gim, UUID toAgentID) protected bool SendIMToScene(GridInstantMessage gim, UUID toAgentID)

2
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncAvatar.cs
View File

@ -615,7 +615,7 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
m_log.Debug("[REGION SYNC AVATAR] AttachObject"); m_log.Debug("[REGION SYNC AVATAR] AttachObject");
} }
public virtual void SendDialog(string objectname, UUID objectID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels) public virtual void SendDialog(string objectname, UUID objectID, UUID ownerID, string ownerFirstName, string ownerLastName, string msg, UUID textureID, int ch, string[] buttonlabels)
{ {
IGridDialogModule gridDialogModule = m_scene.RequestModuleInterface<IGridDialogModule>(); IGridDialogModule gridDialogModule = m_scene.RequestModuleInterface<IGridDialogModule>();

2
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
View File

@ -1558,7 +1558,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
/// <returns>The shape parsed</returns> /// <returns>The shape parsed</returns>
//DSG SYNC: make it public to be called outside //DSG SYNC: make it public to be called outside
//static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors) //static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors)
public PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors) public static PrimitiveBaseShape ReadShape(XmlTextReader reader, string name, out bool errors)
{ {
errors = false; errors = false;