ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
This commit is contained in:
Melanie
2012-05-05 10:32:04 +01:00
parent 8b1cc0dd29 01b00ad0d5
commit 31ab8b2fe0
60 changed files with 831 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Server/Handlers/Authentication/OpenIdServerHandler.cs
View File

@@ -191,6 +191,8 @@ For more information, see <a href='http://openid.net/'>http://openid.net/</a>.
#endregion HTML
public string Name { get { return "OpenId"; } }
public string Description { get { return null; } }
public string ContentType { get { return m_contentType; } }
public string HttpMethod { get { return m_httpMethod; } }
public string Path { get { return m_path; } }

4
OpenSim/Server/Handlers/Friends/FriendsServerPostHandler.cs
View File

@@ -95,7 +95,8 @@ namespace OpenSim.Server.Handlers.Friends
return DeleteFriendString(request);
}
m_log.DebugFormat("[FRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
m_log.DebugFormat("[FRIENDS HANDLER]: unknown method request {0}", method);
}
catch (Exception e)
{
@@ -103,7 +104,6 @@ namespace OpenSim.Server.Handlers.Friends
}
return FailureResult();
}
#region Method-specific handlers

2
OpenSim/Server/Handlers/Grid/GridServerPostHandler.cs
View File

@@ -116,7 +116,7 @@ namespace OpenSim.Server.Handlers.Grid
return GetRegionFlags(request);
}
m_log.DebugFormat("[GRID HANDLER]: unknown method {0} request {1}", method.Length, method);
m_log.DebugFormat("[GRID HANDLER]: unknown method request {0}", method);
}
catch (Exception e)
{

3
OpenSim/Server/Handlers/Hypergrid/HGFriendsServerPostHandler.cs
View File

@@ -122,7 +122,8 @@ namespace OpenSim.Server.Handlers.Hypergrid
return GrantRights(request);
*/
}
m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0} request {1}", method.Length, method);
m_log.DebugFormat("[HGFRIENDS HANDLER]: unknown method {0}", method);
}
catch (Exception e)
{