Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2011-01-17 17:41:06 -0800
committer: Diva Canto 2011-01-17 17:41:06 -0800
commit: a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree: 3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/CoreModules/Avatar/Assets
parent: Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent: force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download: opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
index 36aaab3..8347e35 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
        {
            UUID capID = UUID.Random();
-            m_log.Info("[GETMESH]: /CAPS/" + capID);
+//            m_log.Info("[GETMESH]: /CAPS/" + capID);
            caps.RegisterHandler("GetMesh",
                                 new RestHTTPHandler("GET", "/CAPS/" + capID,
                                                       delegate(Hashtable m_dhttpMethod)
diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
index 1f60e36..6fb8b46 100644
--- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        {
            UUID capID = UUID.Random();
-            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
+//            m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
            caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
        }
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
        /// <returns>False for "caller try another codec"; true otherwise</returns>
        private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
        {
-            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
+//            m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
            AssetBase texture;
            string fullID = textureID.ToString();
author	Diva Canto	2011-01-17 17:41:06 -0800
committer	Diva Canto	2011-01-17 17:41:06 -0800
commit	a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree	3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Region/CoreModules/Avatar/Assets
parent	Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent	force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download	opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2 opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz

diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs index 36aaab3..8347e35 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetMeshModule.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Assets
102	{	102	{
103	UUID capID = UUID.Random();	103	UUID capID = UUID.Random();
104		104
105	m_log.Info("[GETMESH]: /CAPS/" + capID);	105	// m_log.Info("[GETMESH]: /CAPS/" + capID);
106	caps.RegisterHandler("GetMesh",	106	caps.RegisterHandler("GetMesh",
107	new RestHTTPHandler("GET", "/CAPS/" + capID,	107	new RestHTTPHandler("GET", "/CAPS/" + capID,
108	delegate(Hashtable m_dhttpMethod)	108	delegate(Hashtable m_dhttpMethod)


diff --git a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs index 1f60e36..6fb8b46 100644 --- a/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Assets/GetTextureModule.cs
@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
105	{	105	{
106	UUID capID = UUID.Random();	106	UUID capID = UUID.Random();
107		107
108	m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);	108	// m_log.InfoFormat("[GETTEXTURE]: /CAPS/{0} in region {1}", capID, m_scene.RegionInfo.RegionName);
109	caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));	109	caps.RegisterHandler("GetTexture", new StreamHandler("GET", "/CAPS/" + capID, ProcessGetTexture));
110	}	110	}
111		111
@@ -171,7 +171,7 @@ namespace OpenSim.Region.CoreModules.Avatar.ObjectCaps
171	/// <returns>False for "caller try another codec"; true otherwise</returns>	171	/// <returns>False for "caller try another codec"; true otherwise</returns>
172	private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)	172	private bool FetchTexture(OSHttpRequest httpRequest, OSHttpResponse httpResponse, UUID textureID, string format)
173	{	173	{
174	m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);	174	// m_log.DebugFormat("[GETTEXTURE]: {0} with requested format {1}", textureID, format);
175	AssetBase texture;	175	AssetBase texture;
176		176
177	string fullID = textureID.ToString();	177	string fullID = textureID.ToString();