ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis#2725. Thank you kindly, Diva, for a patch that:

Browse Source 
Adds missing protocol pieces for EstablishAgentCommunication
event which allows the client to activate CAPS and the EQ for 
child agents.
This commit is contained in:
Charles Krinke
2008-12-14 02:17:12 +00:00
parent 6cf0b81864
commit e6eb571c1d
12 changed files with 501 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenSim/Framework/AgentCircuitData.cs
View File

@@ -26,6 +26,7 @@
*/
using System;
using System.Collections.Generic;
using OpenMetaverse;
namespace OpenSim.Framework
@@ -35,6 +36,7 @@ namespace OpenSim.Framework
public UUID AgentID;
public UUID BaseFolder;
public string CapsPath = String.Empty;
public Dictionary<ulong, string> ChildrenCapSeeds;
public bool child;
public uint circuitcode;
public string firstname;
@@ -61,6 +63,7 @@ namespace OpenSim.Framework
InventoryFolder = new UUID(cAgent.InventoryFolder);
BaseFolder = new UUID(cAgent.BaseFolder);
CapsPath = cAgent.CapsPath;
ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
}
}
@@ -70,6 +73,7 @@ namespace OpenSim.Framework
public Guid AgentID;
public Guid BaseFolder;
public string CapsPath = String.Empty;
public Dictionary<ulong, string> ChildrenCapSeeds;
public bool child;
public uint circuitcode;
public string firstname;
@@ -100,6 +104,7 @@ namespace OpenSim.Framework
InventoryFolder = cAgent.InventoryFolder.Guid;
BaseFolder = cAgent.BaseFolder.Guid;
CapsPath = cAgent.CapsPath;
ChildrenCapSeeds = cAgent.ChildrenCapSeeds;
}
}
}

3
OpenSim/Framework/IScene.cs
View File

@@ -25,6 +25,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
using System.Collections.Generic;
using OpenMetaverse;
namespace OpenSim.Framework
@@ -73,7 +74,9 @@ namespace OpenSim.Framework
bool PresenceChildStatus(UUID avatarID);
// Diva: get this out of here!!!
string GetCapsPath(UUID agentId);
Dictionary<ulong, string> GetChildrenSeeds(UUID agentId);
T RequestModuleInterface<T>();
T[] RequestModuleInterfaces<T>();

2
OpenSim/Framework/Util.cs
View File

@@ -350,7 +350,7 @@ namespace OpenSim.Framework
public static bool IsOutsideView(uint oldx, uint newx, uint oldy, uint newy)
{
// Eventually this will be a function of the draw distance / camera position too.
return ((Math.Abs((int)(oldx - newx)) > 1) || (Math.Abs((int)(oldy - newy)) > 1));
return (((int)Math.Abs((int)(oldx - newx)) > 1) || ((int)Math.Abs((int)(oldy - newy)) > 1));
}
public static string FieldToString(byte[] bytes)