OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/opensim/var/repo/opensim

integration
BlueWall 2012-04-24 18:16:06 -04:00
parent 3dc88c55a9 54d5ff6774
commit c0b2e64a90
7 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Console/LocalConsole.cs
View File

@ -296,6 +296,10 @@ namespace OpenSim.Framework.Console
matches[0].Groups["Category"].Value); matches[0].Groups["Category"].Value);
System.Console.Write("]:"); System.Console.Write("]:");
} }
else
{
outText = outText.Trim();
}
} }
if (level == "error") if (level == "error")

4
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -143,7 +143,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace); UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId;
m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}",
attach.ItemID, attach.AssetID, p, agentId, e.Message, e.StackTrace);
} }
} }
} }

11
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
View File

@ -248,10 +248,10 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
if (bakedTextureFace == null) if (bakedTextureFace == null)
{ {
m_log.WarnFormat( // This can happen legitimately, since some baked textures might not exist
"[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently", //m_log.WarnFormat(
bakeType, sp.Name, m_scene.RegionInfo.RegionName); // "[AV FACTORY]: No texture ID set for {0} for {1} in {2} not found when trying to save permanently",
// bakeType, sp.Name, m_scene.RegionInfo.RegionName);
continue; continue;
} }
@ -417,7 +417,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]); // acd.AgentID, i, acd.Appearance.Texture.FaceTextures[i]);
int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType); int ftIndex = (int)AppearanceManager.BakeTypeToAgentTextureIndex(bakeType);
bakedTextures[bakeType] = faceTextures[ftIndex]; Primitive.TextureEntryFace texture = faceTextures[ftIndex]; // this will be null if there's no such baked texture
bakedTextures[bakeType] = texture;
} }
return bakedTextures; return bakedTextures;

4
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
View File

@ -157,7 +157,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
sp.CompleteMovement(npcAvatar, false); sp.CompleteMovement(npcAvatar, false);
m_avatars.Add(npcAvatar.AgentId, npcAvatar); m_avatars.Add(npcAvatar.AgentId, npcAvatar);
m_log.DebugFormat("[NPC MODULE]: Created NPC with id {0}", npcAvatar.AgentId); m_log.DebugFormat("[NPC MODULE]: Created NPC {0} {1}", npcAvatar.AgentId, sp.Name);
return npcAvatar.AgentId; return npcAvatar.AgentId;
} }
@ -299,7 +299,7 @@ namespace OpenSim.Region.OptionalModules.World.NPC
scene.RemoveClient(agentID, false); scene.RemoveClient(agentID, false);
m_avatars.Remove(agentID); m_avatars.Remove(agentID);
// m_log.DebugFormat("[NPC MODULE]: Removed {0} {1}", agentID, av.Name); m_log.DebugFormat("[NPC MODULE]: Removed NPC {0} {1}", agentID, av.Name);
return true; return true;
} }
} }

8
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
View File

@ -1812,9 +1812,11 @@ namespace OpenSim.Region.ScriptEngine.XEngine
// if there already exists a file at that location, it may be locked. // if there already exists a file at that location, it may be locked.
m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message); m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message);
} }
string textpath = path + ".text";
try try
{ {
using (FileStream fs = File.Create(path + ".text")) using (FileStream fs = File.Create(textpath))
{ {
using (StreamWriter sw = new StreamWriter(fs)) using (StreamWriter sw = new StreamWriter(fs))
{ {
@ -1827,7 +1829,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
catch (IOException ex) catch (IOException ex)
{ {
// if there already exists a file at that location, it may be locked. // if there already exists a file at that location, it may be locked.
m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", path, ex.Message); m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", textpath, ex.Message);
} }
} }
} }
@ -1876,7 +1878,7 @@ namespace OpenSim.Region.ScriptEngine.XEngine
catch (IOException ex) catch (IOException ex)
{ {
// if there already exists a file at that location, it may be locked. // if there already exists a file at that location, it may be locked.
m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", statepath, ex.Message); m_log.ErrorFormat("[XEngine]: File {0} already exists! {1}", mappath, ex.Message);
} }
} }

5
OpenSim/Server/Base/ServerUtils.cs
View File

@ -118,7 +118,10 @@ namespace OpenSim.Server.Base
catch (Exception e) catch (Exception e)
{ {
if (!(e is System.MissingMethodException)) if (!(e is System.MissingMethodException))
m_log.ErrorFormat("Error loading plugin from {0}, exception {1}", dllName, e.InnerException); {
m_log.ErrorFormat("Error loading plugin {0} from {1}. Exception: {2}",
interfaceName, dllName, e.InnerException == null ? e.Message : e.InnerException.Message);
}
return null; return null;
} }

31
OpenSim/Services/LLLoginService/LLLoginResponse.cs
View File

@ -351,21 +351,26 @@ namespace OpenSim.Services.LLLoginService
{ {
TimeZoneInfo gridTimeZone; TimeZoneInfo gridTimeZone;
try // Disabled for now pending making timezone a config value, which can at some point have a default of
{ // a ; separated list of possible timezones.
// First try to fetch DST from Pacific Standard Time, because this is // The problem here is that US/Pacific (or even the Olsen America/Los_Angeles) is not universal across
// the one expected by the viewer. "US/Pacific" is the string to search // windows, mac and various distributions of linux, introducing another element of consistency.
// on linux and mac, and should work also on Windows (to confirm) // The server operator needs to be able to control this setting
gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific"); // try
} // {
catch (Exception e) // // First try to fetch DST from Pacific Standard Time, because this is
{ // // the one expected by the viewer. "US/Pacific" is the string to search
m_log.WarnFormat( // // on linux and mac, and should work also on Windows (to confirm)
"[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time", // gridTimeZone = TimeZoneInfo.FindSystemTimeZoneById("US/Pacific");
e.Message); // }
// catch (Exception e)
// {
// m_log.WarnFormat(
// "[TIMEZONE]: {0} Falling back to system time. System time should be set to Pacific Standard Time to provide the expected time",
// e.Message);
gridTimeZone = TimeZoneInfo.Local; gridTimeZone = TimeZoneInfo.Local;
} // }
DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N"; DST = gridTimeZone.IsDaylightSavingTime(DateTime.Now) ? "Y" : "N";