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

Merge branch 'master' into careminster

avinationmerge
Melanie 2009-12-23 21:22:19 +00:00
parent 30f59370d3 f2d2073f2b
commit 6eecbc95e4
7 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -232,7 +232,26 @@ namespace OpenSim.Framework.Communications.Cache
/// <returns></returns>
public Dictionary<UUID, InventoryFolderImpl> RequestSelfAndDescendentFolders()
{
return libraryFolders;
Dictionary<UUID, InventoryFolderImpl> fs = new Dictionary<UUID, InventoryFolderImpl>();
fs.Add(ID, this);
List<InventoryFolderImpl> fis = TraverseFolder(this);
foreach (InventoryFolderImpl f in fis)
{
fs.Add(f.ID, f);
}
//return libraryFolders;
return fs;
}
private List<InventoryFolderImpl> TraverseFolder(InventoryFolderImpl node)
{
List<InventoryFolderImpl> folders = node.RequestListOfFolderImpls();
List<InventoryFolderImpl> subs = new List<InventoryFolderImpl>();
foreach (InventoryFolderImpl f in folders)
subs.AddRange(TraverseFolder(f));
folders.AddRange(subs);
return folders;
}
}
}

14
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
View File

@ -322,15 +322,15 @@ namespace OpenSim.Framework.Servers.HttpServer
HandleRequest(req, resp);
}
public void ConvertIHttpClientContextToOSHttp(object stateinfo)
{
HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
// public void ConvertIHttpClientContextToOSHttp(object stateinfo)
// {
// HttpServerContextObj objstate = (HttpServerContextObj)stateinfo;
OSHttpRequest request = objstate.oreq;
OSHttpResponse resp = objstate.oresp;
// OSHttpRequest request = objstate.oreq;
// OSHttpResponse resp = objstate.oresp;
HandleRequest(request,resp);
}
// HandleRequest(request,resp);
// }
public virtual void HandleRequest(OSHttpRequest request, OSHttpResponse response)
{

13
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
View File

@ -174,7 +174,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
return nodesLoaded;
}
public void Close()
{
if (m_loadStream != null)
m_loadStream.Close();
}
/// <summary>
/// Replicate the inventory paths in the archive to the user's inventory as necessary.
/// </summary>
@ -258,6 +264,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
= rawDirsToCreate[i].LastIndexOf(
ArchiveConstants.INVENTORY_NODE_NAME_COMPONENT_SEPARATOR);
if (identicalNameIdentifierIndex < 0)
{
i++;
continue;
}
string newFolderName = rawDirsToCreate[i].Remove(identicalNameIdentifierIndex);
newFolderName = InventoryArchiveUtils.UnescapeArchivePath(newFolderName);

2
OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IObject.cs
View File

@ -179,6 +179,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
/// </summary>
/// <param name="msg">The message to send to the user</param>
void Say(string msg);
void Say(string msg,int channel);
//// <value>
/// Grants access to the objects inventory

1
OpenSim/Region/OptionalModules/Scripting/Minimodule/Interfaces/IWorld.cs
View File

@ -41,6 +41,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
{
public string Text;
public IEntity Sender;
public int Channel;
}
public delegate void OnChatDelegate(IWorld sender, ChatEventArgs e);

9
OpenSim/Region/OptionalModules/Scripting/Minimodule/SOPObject.cs
View File

@ -384,6 +384,15 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
m_rootScene.SimChat(msg, ChatTypeEnum.Say, sop.AbsolutePosition, sop.Name, sop.UUID, false);
}
public void Say(string msg,int channel)
{
if (!CanEdit())
return;
SceneObjectPart sop = GetSOP();
m_rootScene.SimChat(Utils.StringToBytes(msg), ChatTypeEnum.Say,channel, sop.AbsolutePosition, sop.Name, sop.UUID, false);
}
#endregion

6
OpenSim/Region/OptionalModules/Scripting/Minimodule/World.cs
View File

@ -148,7 +148,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
ChatEventArgs e = new ChatEventArgs();
e.Sender = new SOPObject(m_internalScene, ((SceneObjectPart) chat.SenderObject).LocalId, m_security);
e.Text = chat.Message;
e.Channel = chat.Channel;
_OnChat(this, e);
return;
}
@ -158,7 +159,8 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
ChatEventArgs e = new ChatEventArgs();
e.Sender = new SPAvatar(m_internalScene, chat.SenderUUID, m_security);
e.Text = chat.Message;
e.Channel = chat.Channel;
_OnChat(this, e);
return;
}