Hopefully fixed the issue of inventory not working for the master account. (Note you will need to delete userprofile.yap for this to take effect.)
parent
4276a352bc
commit
8b4955f6c1
|
@ -213,28 +213,6 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void RunCommandScript(string fileName)
|
|
||||||
{
|
|
||||||
MainLog.Instance.Verbose("Running command script (" + fileName + ")");
|
|
||||||
if (File.Exists(fileName))
|
|
||||||
{
|
|
||||||
StreamReader readFile = File.OpenText(fileName);
|
|
||||||
string currentCommand = "";
|
|
||||||
while ((currentCommand = readFile.ReadLine()) != null)
|
|
||||||
{
|
|
||||||
if (currentCommand != "")
|
|
||||||
{
|
|
||||||
MainLog.Instance.Verbose("Running '" + currentCommand + "'");
|
|
||||||
MainLog.Instance.MainLogRunCommand(currentCommand);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
MainLog.Instance.Error("Command script missing. Can not run commands");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private static void CreateDefaultRegionInfoXml(string fileName)
|
private static void CreateDefaultRegionInfoXml(string fileName)
|
||||||
{
|
{
|
||||||
new RegionInfo("DEFAULT REGION CONFIG", fileName);
|
new RegionInfo("DEFAULT REGION CONFIG", fileName);
|
||||||
|
@ -322,6 +300,32 @@ namespace OpenSim
|
||||||
}
|
}
|
||||||
|
|
||||||
#region Console Commands
|
#region Console Commands
|
||||||
|
/// <summary>
|
||||||
|
///
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="fileName"></param>
|
||||||
|
private void RunCommandScript(string fileName)
|
||||||
|
{
|
||||||
|
MainLog.Instance.Verbose("Running command script (" + fileName + ")");
|
||||||
|
if (File.Exists(fileName))
|
||||||
|
{
|
||||||
|
StreamReader readFile = File.OpenText(fileName);
|
||||||
|
string currentCommand = "";
|
||||||
|
while ((currentCommand = readFile.ReadLine()) != null)
|
||||||
|
{
|
||||||
|
if (currentCommand != "")
|
||||||
|
{
|
||||||
|
MainLog.Instance.Verbose("Running '" + currentCommand + "'");
|
||||||
|
MainLog.Instance.MainLogRunCommand(currentCommand);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
MainLog.Instance.Error("Command script missing. Can not run commands");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Runs commands issued by the server console from the operator
|
/// Runs commands issued by the server console from the operator
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -63,6 +63,10 @@ namespace OpenSim.Region.Communications.Local
|
||||||
{
|
{
|
||||||
Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
|
Console.WriteLine("Unknown Master User after creation attempt. No clue what to do here.");
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_Parent.InvenServices.CreateNewUserInventory(profile.UUID);
|
||||||
|
}
|
||||||
|
|
||||||
return profile;
|
return profile;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue