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

Merge branch 'master' of /var/git/opensim/

viewer-2-initial-appearance
opensim mirror account 2010-11-08 04:50:04 -08:00
parent 2e4c0c66ff ae9c4a4d11
commit 4a20a544d6
10 changed files with 86 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -117,7 +117,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
m_application = openSim; m_application = openSim;
string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0"); string bind_ip_address = m_config.GetString("bind_ip_address", "0.0.0.0");
IPAddress ipaddr = IPAddress.Parse( bind_ip_address ); IPAddress ipaddr = IPAddress.Parse(bind_ip_address);
m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr); m_httpServer = MainServer.GetHttpServer((uint)port,ipaddr);
Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>(); Dictionary<string, XmlRpcMethod> availableMethods = new Dictionary<string, XmlRpcMethod>();

13
OpenSim/Framework/AvatarAppearance.cs
View File

@ -177,7 +177,7 @@ namespace OpenSim.Framework
m_owner = appearance.Owner; m_owner = appearance.Owner;
m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ ) for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
m_wearables[i] = new AvatarWearable(); m_wearables[i] = new AvatarWearable();
if (copyWearables && (appearance.Wearables != null)) if (copyWearables && (appearance.Wearables != null))
{ {
@ -204,9 +204,9 @@ namespace OpenSim.Framework
public void GetAssetsFrom(AvatarAppearance app) public void GetAssetsFrom(AvatarAppearance app)
{ {
for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ ) for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
{ {
for (int j = 0 ; j < m_wearables[i].Count ; j++) for (int j = 0; j < m_wearables[i].Count; j++)
{ {
UUID itemID = m_wearables[i][j].ItemID; UUID itemID = m_wearables[i][j].ItemID;
UUID assetID = app.Wearables[i].GetAsset(itemID); UUID assetID = app.Wearables[i].GetAsset(itemID);
@ -220,7 +220,7 @@ namespace OpenSim.Framework
public void ClearWearables() public void ClearWearables()
{ {
m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES]; m_wearables = new AvatarWearable[AvatarWearable.MAX_WEARABLES];
for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++ ) for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
m_wearables[i] = new AvatarWearable(); m_wearables[i] = new AvatarWearable();
} }
@ -347,11 +347,10 @@ namespace OpenSim.Framework
// m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID); // m_log.WarnFormat("[AVATARAPPEARANCE] set wearable {0} --> {1}:{2}",wearableId,wearable.ItemID,wearable.AssetID);
// DEBUG OFF // DEBUG OFF
m_wearables[wearableId].Clear(); m_wearables[wearableId].Clear();
for (int i = 0 ; i < wearable.Count ; i++) for (int i = 0; i < wearable.Count; i++)
m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID); m_wearables[wearableId].Add(wearable[i].ItemID, wearable[i].AssetID);
} }
// DEBUG ON // DEBUG ON
public override String ToString() public override String ToString()
{ {
@ -365,7 +364,7 @@ namespace OpenSim.Framework
foreach (AvatarWearable awear in m_wearables) foreach (AvatarWearable awear in m_wearables)
{ {
for ( int i = 0 ; i < awear.Count ; i++ ) for (int i = 0; i < awear.Count; i++)
s += String.Format("Wearable: item={0}, asset={1}\n",awear[i].ItemID,awear[i].AssetID); s += String.Format("Wearable: item={0}, asset={1}\n",awear[i].ItemID,awear[i].AssetID);
} }

2
OpenSim/Framework/MainServer.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Framework
m_Servers[port] = new BaseHttpServer(port); m_Servers[port] = new BaseHttpServer(port);
if (ipaddr != null ) if (ipaddr != null)
m_Servers[port].ListenIPAddress = ipaddr; m_Servers[port].ListenIPAddress = ipaddr;
m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port); m_log.InfoFormat("[MAIN HTTP SERVER]: Starting main http server on port {0}", port);

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

@ -178,7 +178,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
UUID itemID = UUID.Zero; UUID itemID = UUID.Zero;
if (sp != null) if (sp != null)
{ {
foreach(SceneObjectGroup grp in sp.Attachments) foreach (SceneObjectGroup grp in sp.Attachments)
{ {
if (grp.GetAttachmentPoint() == (byte)AttachmentPt) if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
{ {

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

@ -139,7 +139,6 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
return cached; return cached;
} }
/// <summary> /// <summary>
/// Set appearance data (textureentry and slider settings) received from the client /// Set appearance data (textureentry and slider settings) received from the client
/// </summary> /// </summary>
@ -221,7 +220,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void QueueAppearanceSend(UUID agentid) public void QueueAppearanceSend(UUID agentid)
{ {
// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}",agentid); // m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance send for {0}", agentid);
// 100 nanoseconds (ticks) we should wait // 100 nanoseconds (ticks) we should wait
long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000); long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_sendtime * 10000000);
@ -234,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
public void QueueAppearanceSave(UUID agentid) public void QueueAppearanceSave(UUID agentid)
{ {
// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}",agentid); // m_log.WarnFormat("[AVATAR FACTORY MODULE]: Queue appearance save for {0}", agentid);
// 100 nanoseconds (ticks) we should wait // 100 nanoseconds (ticks) we should wait
long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000); long timestamp = DateTime.Now.Ticks + Convert.ToInt64(m_savetime * 10000000);
@ -262,7 +261,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// Send the appearance back to the avatar // Send the appearance back to the avatar
// AvatarAppearance avp = sp.Appearance; // AvatarAppearance avp = sp.Appearance;
// sp.ControllingClient.SendAppearance(avp.Owner,avp.VisualParams,avp.Texture.GetBytes()); // sp.ControllingClient.SendAppearance(avp.Owner, avp.VisualParams, avp.Texture.GetBytes());
/* /*
// this needs to be fixed, the flag should be on scene presence not the region module // this needs to be fixed, the flag should be on scene presence not the region module
@ -293,8 +292,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
lock (m_sendqueue) lock (m_sendqueue)
{ {
Dictionary<UUID,long> sends = new Dictionary<UUID,long>(m_sendqueue); Dictionary<UUID, long> sends = new Dictionary<UUID, long>(m_sendqueue);
foreach (KeyValuePair<UUID,long> kvp in sends) foreach (KeyValuePair<UUID, long> kvp in sends)
{ {
if (kvp.Value < now) if (kvp.Value < now)
{ {
@ -306,8 +305,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
lock (m_savequeue) lock (m_savequeue)
{ {
Dictionary<UUID,long> saves = new Dictionary<UUID,long>(m_savequeue); Dictionary<UUID, long> saves = new Dictionary<UUID, long>(m_savequeue);
foreach (KeyValuePair<UUID,long> kvp in saves) foreach (KeyValuePair<UUID, long> kvp in saves)
{ {
if (kvp.Value < now) if (kvp.Value < now)
{ {
@ -337,7 +336,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
// m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId); // m_log.WarnFormat("[AVATAR FACTORY MODULE]: Received request for wearables of {0}", client.AgentId);
client.SendWearables(sp.Appearance.Wearables,sp.Appearance.Serial++); client.SendWearables(sp.Appearance.Wearables, sp.Appearance.Serial++);
} }
/// <summary> /// <summary>
@ -354,14 +353,14 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
return; return;
} }
// m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}",client.AgentId); // m_log.WarnFormat("[AVATAR FACTORY MODULE]: AvatarIsWearing called for {0}", client.AgentId);
AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance, false); AvatarAppearance avatAppearance = new AvatarAppearance(sp.Appearance, false);
foreach (AvatarWearingArgs.Wearable wear in e.NowWearing) foreach (AvatarWearingArgs.Wearable wear in e.NowWearing)
{ {
if (wear.Type < AvatarWearable.MAX_WEARABLES) if (wear.Type < AvatarWearable.MAX_WEARABLES)
avatAppearance.Wearables[wear.Type].Add(wear.ItemID,UUID.Zero); avatAppearance.Wearables[wear.Type].Add(wear.ItemID, UUID.Zero);
} }
avatAppearance.GetAssetsFrom(sp.Appearance); avatAppearance.GetAssetsFrom(sp.Appearance);
@ -381,7 +380,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
{ {
for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++) for (int i = 0; i < AvatarWearable.MAX_WEARABLES; i++)
{ {
for (int j = 0 ; j < appearance.Wearables[j].Count ; j ++ ) for (int j = 0; j < appearance.Wearables[j].Count; j++)
{ {
if (appearance.Wearables[i][j].ItemID == UUID.Zero) if (appearance.Wearables[i][j].ItemID == UUID.Zero)
continue; continue;