Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Autoprops everywhere

Browse Source
This commit is contained in:
Cinder
2021-12-09 14:21:48 -06:00
parent 164e40420d
commit d8b115c1b0
29 changed files with 614 additions and 894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
Programs/GridProxy/GridProxy.cs
View File

@@ -2115,12 +2115,6 @@ namespace GridProxy
// Describes a caps URI
public class CapInfo
{
private string uri;
private IPEndPoint sim;
private string type;
private CapsDataFormat reqFmt;
private CapsDataFormat respFmt;
private List<CapsDelegate> Delegates = new List<CapsDelegate>();
@@ -2129,28 +2123,17 @@ namespace GridProxy
this(URI, Sim, CapType, CapsDataFormat.OSD, CapsDataFormat.OSD) { }
public CapInfo(string URI, IPEndPoint Sim, string CapType, CapsDataFormat ReqFmt, CapsDataFormat RespFmt)
{
uri = URI; sim = Sim; type = CapType; reqFmt = ReqFmt; respFmt = RespFmt;
}
public string URI
{
get { return uri; }
}
public string CapType
{
get { return type; } /* EventQueueGet, etc */
}
public IPEndPoint Sim
{
get { return sim; }
}
public CapsDataFormat ReqFmt
{
get { return reqFmt; } /* expected request format */
}
public CapsDataFormat RespFmt
{
get { return respFmt; } /* expected response format */
this.URI = URI; this.Sim = Sim; this.CapType = CapType; this.ReqFmt = ReqFmt; this.RespFmt = RespFmt;
}
public string URI { get; }
public string CapType { get; /* EventQueueGet, etc */ }
public IPEndPoint Sim { get; }
public CapsDataFormat ReqFmt { get; /* expected request format */ }
public CapsDataFormat RespFmt { get; /* expected response format */ }
public void AddDelegate(CapsDelegate deleg)
{

44
Programs/GridProxy/GridProxyLoader.cs
View File

@@ -19,39 +19,19 @@ namespace GridProxy
{
public Proxy proxy;
private Dictionary<string, CommandDelegate> commandDelegates = new Dictionary<string, CommandDelegate>();
private UUID agentID;
private UUID sessionID;
private UUID secureSessionID;
private UUID inventoryRoot;
private bool logLogin = false;
private string[] args;
public delegate void CommandDelegate(string[] words);
public string[] Args
{
get { return args; }
}
public string[] Args { get; private set; }
public UUID AgentID
{
get { return agentID; }
}
public UUID AgentID { get; private set; }
public UUID SessionID
{
get { return sessionID; }
}
public UUID SessionID { get; private set; }
public UUID SecureSessionID
{
get { return secureSessionID; }
}
public UUID SecureSessionID { get; private set; }
public UUID InventoryRoot
{
get { return inventoryRoot; }
}
public UUID InventoryRoot { get; private set; }
public void AddCommand(string cmd, CommandDelegate deleg)
{
@@ -71,7 +51,7 @@ namespace GridProxy
private void Init(string[] args, ProxyConfig proxyConfig)
{
//bool externalPlugin = false;
this.args = args;
this.Args = args;
if (proxyConfig == null)
{
@@ -166,19 +146,19 @@ namespace GridProxy
{
System.Collections.Hashtable values = (System.Collections.Hashtable)response.Value;
if (values.Contains("agent_id"))
agentID = new UUID((string)values["agent_id"]);
AgentID = new UUID((string)values["agent_id"]);
if (values.Contains("session_id"))
sessionID = new UUID((string)values["session_id"]);
SessionID = new UUID((string)values["session_id"]);
if (values.Contains("secure_session_id"))
secureSessionID = new UUID((string)values["secure_session_id"]);
SecureSessionID = new UUID((string)values["secure_session_id"]);
if (values.Contains("inventory-root"))
{
inventoryRoot = new UUID(
InventoryRoot = new UUID(
(string)((System.Collections.Hashtable)(((System.Collections.ArrayList)values["inventory-root"])[0]))?["folder_id"]
);
if (logLogin)
{
Console.WriteLine("inventory root: " + inventoryRoot);
Console.WriteLine("inventory root: " + InventoryRoot);
}
}
@@ -230,7 +210,7 @@ namespace GridProxy
ChatFromSimulatorPacket packet = new ChatFromSimulatorPacket();
packet.ChatData.SourceID = UUID.Random();
packet.ChatData.FromName = Utils.StringToBytes(fromName);
packet.ChatData.OwnerID = agentID;
packet.ChatData.OwnerID = AgentID;
packet.ChatData.SourceType = (byte)2;
packet.ChatData.ChatType = (byte)1;
packet.ChatData.Audible = (byte)1;

2
Programs/GridProxy/Plugins/ClientAO.cs
View File

@@ -286,7 +286,7 @@ public class ClientAO : ProxyPlugin
// Start the search
RequestFolderContents(baseFolder,
true,
(searchPath.Length == 1) ? true : false,
(searchPath.Length == 1),
InventorySortOrder.ByName);
}

2
Programs/examples/TestClient/TestClient.cs
View File

@@ -100,7 +100,7 @@ namespace OpenMetaverse.TestClient
void Self_IM(object sender, InstantMessageEventArgs e)
{
bool groupIM = e.IM.GroupIM && GroupMembers != null && GroupMembers.ContainsKey(e.IM.FromAgentID) ? true : false;
bool groupIM = e.IM.GroupIM && GroupMembers != null && GroupMembers.ContainsKey(e.IM.FromAgentID);
if (e.IM.FromAgentID == MasterKey || (GroupCommands && groupIM))
{