Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
bb69a40fbb
|
@ -319,6 +319,8 @@ namespace OpenSim.Framework.Servers
|
|||
return;
|
||||
}
|
||||
|
||||
if (cmd.Length > 3)
|
||||
{
|
||||
string rawLevel = cmd[3];
|
||||
|
||||
ILoggerRepository repository = LogManager.GetRepository();
|
||||
|
@ -331,6 +333,7 @@ namespace OpenSim.Framework.Servers
|
|||
String.Format(
|
||||
"{0} is not a valid logging level. Valid logging levels are ALL, DEBUG, INFO, WARN, ERROR, FATAL, OFF",
|
||||
rawLevel));
|
||||
}
|
||||
|
||||
Notice(String.Format("Console log level is {0}", m_consoleAppender.Threshold));
|
||||
}
|
||||
|
|
|
@ -983,7 +983,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
|
|||
/// </summary>
|
||||
public void EnableChildAgent(ScenePresence sp, GridRegion region)
|
||||
{
|
||||
m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighour {0}", region.RegionName);
|
||||
m_log.DebugFormat("[ENTITY TRANSFER]: Enabling child agent in new neighbour {0}", region.RegionName);
|
||||
|
||||
AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
|
||||
AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
|
||||
|
|
|
@ -2055,8 +2055,9 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
|
||||
public void GetProperties(IClientAPI client)
|
||||
{
|
||||
//Viewer wants date in microseconds so multiply it by 1,000,000.
|
||||
client.SendObjectPropertiesReply(
|
||||
m_fromUserInventoryItemID, (ulong)_creationDate, _creatorID, UUID.Zero, UUID.Zero,
|
||||
m_fromUserInventoryItemID, (ulong)_creationDate*(ulong)1e6, _creatorID, UUID.Zero, UUID.Zero,
|
||||
_groupID, (short)InventorySerial, _lastOwnerID, UUID, _ownerID,
|
||||
ParentGroup.RootPart.TouchName, new byte[0], ParentGroup.RootPart.SitName, Name, Description,
|
||||
ParentGroup.RootPart._ownerMask, ParentGroup.RootPart._nextOwnerMask, ParentGroup.RootPart._groupMask, ParentGroup.RootPart._everyoneMask,
|
||||
|
|
|
@ -1750,13 +1750,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
{
|
||||
UUID textureID = new UUID();
|
||||
|
||||
if (!UUID.TryParse(texture, out textureID))
|
||||
{
|
||||
textureID = InventoryKey(texture, (int)AssetType.Texture);
|
||||
}
|
||||
|
||||
if (textureID == UUID.Zero)
|
||||
{
|
||||
if (!UUID.TryParse(texture, out textureID))
|
||||
return;
|
||||
}
|
||||
|
||||
Primitive.TextureEntry tex = part.Shape.Textures;
|
||||
|
||||
|
|
|
@ -286,7 +286,7 @@ namespace OpenSim.Services.GridService
|
|||
}
|
||||
|
||||
}
|
||||
m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighours", region.RegionName, rinfos.Count);
|
||||
m_log.DebugFormat("[GRID SERVICE]: region {0} has {1} neighbours", region.RegionName, rinfos.Count);
|
||||
return rinfos;
|
||||
}
|
||||
|
||||
|
|
|
@ -220,10 +220,16 @@ namespace OpenSim.Services.GridService
|
|||
string[] parts = mapName.Split(new char[] {' '});
|
||||
string regionName = String.Empty;
|
||||
if (parts.Length > 1)
|
||||
regionName = parts[1];
|
||||
{
|
||||
regionName = mapName.Substring(parts[0].Length + 1);
|
||||
regionName = regionName.Trim(new char[] {'"'});
|
||||
}
|
||||
if (TryCreateLink(scopeID, xloc, yloc, regionName, 0, null, parts[0], ownerID, out regInfo, out reason))
|
||||
{
|
||||
regInfo.RegionName = mapName;
|
||||
return regInfo;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
|
|
@ -414,6 +414,15 @@
|
|||
<Key Name="fileName" Value="default_clear.jp2" />
|
||||
</Section>
|
||||
|
||||
<!-- 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 is a UUID that viewers assume exists in the asset server -->
|
||||
<!-- See http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 for more details -->
|
||||
<Section Name="Default Alpha Layer Texture">
|
||||
<Key Name="assetID" Value="3a367d1c-bef1-6d43-7595-e88c1e3aadb3"/>
|
||||
<Key Name="name" Value="Default Alpha Layer Texture"/>
|
||||
<Key Name="assetType" Value="0" />
|
||||
<Key Name="fileName" Value="default_clear.jp2" />
|
||||
</Section>
|
||||
|
||||
<Section Name="Default Avatar">
|
||||
<Key Name="assetID" Value="c228d1cf-4b5d-4ba8-84f4-899a0796aa97"/>
|
||||
<Key Name="name" Value="Default Avatar"/>
|
||||
|
|
Loading…
Reference in New Issue