mirror of
https://github.com/opensim/opensim.git
synced 2026-08-13 05:05:43 +08:00
Update svn properties, formatting cleanup.
This commit is contained in:
@@ -112,7 +112,7 @@ namespace OpenSim.Framework
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Sometimes the circuitcode may not be known before setting up the connection
|
||||
/// </summary>
|
||||
@@ -126,7 +126,7 @@ namespace OpenSim.Framework
|
||||
if (AgentCircuits.ContainsKey((uint)circuitcode) && !AgentCircuits.ContainsKey((uint)newcircuitcode))
|
||||
{
|
||||
AgentCircuitData agentData = AgentCircuits[(uint)circuitcode];
|
||||
|
||||
|
||||
agentData.circuitcode = newcircuitcode;
|
||||
|
||||
AgentCircuits.Remove((uint)circuitcode);
|
||||
@@ -155,4 +155,4 @@ namespace OpenSim.Framework
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -306,7 +306,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
// "[INVENTORY CACHE]: Received item {0} {1} for user {2}",
|
||||
// itemInfo.Name, itemInfo.ID, userID);
|
||||
InventoryFolderImpl folder = null;
|
||||
|
||||
|
||||
if ( RootFolder != null )
|
||||
folder = RootFolder.FindFolder(itemInfo.Folder);
|
||||
|
||||
|
||||
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.Communications.Cache
|
||||
{
|
||||
if (userID == LLUUID.Zero)
|
||||
return;
|
||||
|
||||
|
||||
lock (m_userProfiles)
|
||||
{
|
||||
if (m_userProfiles.ContainsKey(userID))
|
||||
|
||||
@@ -617,9 +617,9 @@ namespace OpenSim.Framework.Communications.Capabilities
|
||||
|
||||
IMoneyModule mm = scene.RequestModuleInterface<IMoneyModule>();
|
||||
|
||||
if(mm != null)
|
||||
if (mm != null)
|
||||
{
|
||||
if(!mm.UploadCovered(client))
|
||||
if (!mm.UploadCovered(client))
|
||||
{
|
||||
client.SendAgentAlertMessage("Unable to upload asset. Insufficient funds.", false);
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ namespace OpenSim.Framework.Communications
|
||||
/// GridInfoService uses the [GridInfo] section of the
|
||||
/// standard OpenSim.ini file --- which is not optimal, but
|
||||
/// anything else requires a general redesign of the config
|
||||
/// system.
|
||||
/// system.
|
||||
/// </remarks>
|
||||
public GridInfoService(IConfigSource configSource)
|
||||
{
|
||||
@@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications
|
||||
/// </summary>
|
||||
public GridInfoService()
|
||||
{
|
||||
try
|
||||
try
|
||||
{
|
||||
IConfigSource configSource = new IniConfigSource(Path.Combine(Util.configDir(), "OpenSim.ini"));
|
||||
loadGridInfo(configSource);
|
||||
@@ -84,15 +84,15 @@ namespace OpenSim.Framework.Communications
|
||||
IConfig startupCfg = configSource.Configs["Startup"];
|
||||
IConfig gridCfg = configSource.Configs["GridInfo"];
|
||||
IConfig netCfg = configSource.Configs["Network"];
|
||||
|
||||
|
||||
bool grid = startupCfg.GetBoolean("gridmode", false);
|
||||
|
||||
|
||||
if (grid)
|
||||
_info["mode"] = "grid";
|
||||
else
|
||||
else
|
||||
_info["mode"] = "standalone";
|
||||
|
||||
|
||||
|
||||
|
||||
if (null != gridCfg)
|
||||
{
|
||||
foreach (string k in gridCfg.GetKeys())
|
||||
|
||||
@@ -351,8 +351,8 @@ namespace OpenSim.Framework
|
||||
|
||||
bool SendLogoutPacketWhenClosing
|
||||
{
|
||||
set;
|
||||
}
|
||||
set;
|
||||
}
|
||||
|
||||
// [Obsolete("LLClientView Specific - Circuits are unique to LLClientView")]
|
||||
uint CircuitCode { get; }
|
||||
@@ -526,7 +526,7 @@ namespace OpenSim.Framework
|
||||
event TerrainUnacked OnUnackedTerrain;
|
||||
event ActivateGesture OnActivateGesture;
|
||||
event DeactivateGesture OnDeactivateGesture;
|
||||
|
||||
|
||||
// void ActivateGesture(LLUUID assetId, LLUUID gestureId);
|
||||
|
||||
// [Obsolete("IClientAPI.OutPacket SHOULD NOT EXIST outside of LLClientView please refactor appropriately.")]
|
||||
|
||||
@@ -278,7 +278,7 @@ namespace OpenSim.Framework.Servers
|
||||
HandleLLSDRequests(request, response);
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
HandleXmlRpcRequests(request, response);
|
||||
return;
|
||||
}
|
||||
@@ -498,7 +498,7 @@ namespace OpenSim.Framework.Servers
|
||||
{
|
||||
// we didn't find a registered llsd handler to service this request
|
||||
// check if we have a default llsd handler
|
||||
|
||||
|
||||
if (m_defaultLlsdHandler != null)
|
||||
{
|
||||
// LibOMV path
|
||||
@@ -541,7 +541,7 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
private bool DoWeHaveALLSDHandler(string path)
|
||||
{
|
||||
|
||||
|
||||
string[] pathbase = path.Split('/');
|
||||
string searchquery = "/";
|
||||
|
||||
@@ -559,27 +559,27 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
foreach (string pattern in m_llsdHandlers.Keys)
|
||||
{
|
||||
|
||||
|
||||
if (searchquery.StartsWith(pattern) && searchquery.Length >= pattern.Length)
|
||||
{
|
||||
|
||||
|
||||
bestMatch = pattern;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
// extra kicker to remove the default XMLRPC login case.. just in case..
|
||||
// extra kicker to remove the default XMLRPC login case.. just in case..
|
||||
if (path == "/")
|
||||
return false;
|
||||
|
||||
if (String.IsNullOrEmpty(bestMatch))
|
||||
{
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -588,7 +588,7 @@ namespace OpenSim.Framework.Servers
|
||||
{
|
||||
llsdHandler = null;
|
||||
// Pull out the first part of the path
|
||||
// splitting the path by '/' means we'll get the following return..
|
||||
// splitting the path by '/' means we'll get the following return..
|
||||
// {0}/{1}/{2}
|
||||
// where {0} isn't something we really control 100%
|
||||
|
||||
@@ -599,7 +599,7 @@ namespace OpenSim.Framework.Servers
|
||||
return false;
|
||||
|
||||
for (int i=1; i<pathbase.Length; i++)
|
||||
{
|
||||
{
|
||||
searchquery += pathbase[i];
|
||||
if (pathbase.Length-1 != i)
|
||||
searchquery += "/";
|
||||
@@ -609,7 +609,7 @@ namespace OpenSim.Framework.Servers
|
||||
//
|
||||
// [] = optional
|
||||
// /resource/UUID/action[/action]
|
||||
//
|
||||
//
|
||||
// now try to get the closest match to the reigstered path
|
||||
// at least for OGP, registered path would probably only consist of the /resource/
|
||||
|
||||
|
||||
@@ -107,20 +107,20 @@ namespace OpenSim.Framework.Servers
|
||||
{
|
||||
sb.Append(m_stats.Report());
|
||||
}
|
||||
|
||||
sb.Append(Environment.NewLine);
|
||||
|
||||
sb.Append(Environment.NewLine);
|
||||
sb.Append(GetThreadsReport());
|
||||
|
||||
m_log.Debug(sb);
|
||||
}
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// Get a report about the registered threads in this server.
|
||||
/// </summary>
|
||||
protected string GetThreadsReport()
|
||||
{
|
||||
StringBuilder sb = new StringBuilder();
|
||||
|
||||
|
||||
List<Thread> threads = ThreadTracker.GetThreads();
|
||||
if (threads == null)
|
||||
{
|
||||
@@ -132,13 +132,13 @@ namespace OpenSim.Framework.Servers
|
||||
foreach (Thread t in threads)
|
||||
{
|
||||
sb.Append(
|
||||
"ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
|
||||
"ID: " + t.ManagedThreadId + ", Name: " + t.Name + ", Alive: " + t.IsAlive
|
||||
+ ", Pri: " + t.Priority + ", State: " + t.ThreadState + Environment.NewLine);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return sb.ToString();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Return a report about the uptime of this server
|
||||
@@ -312,7 +312,7 @@ namespace OpenSim.Framework.Servers
|
||||
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Outputs to the console information about the region
|
||||
|
||||
Reference in New Issue
Block a user