Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
This commit is contained in:
Melanie
2013-01-25 00:10:32 +00:00
24 changed files with 1059 additions and 204 deletions

View File

@@ -4226,6 +4226,7 @@ namespace OpenSim.Region.Framework.Scenes
result.distance = distance2;
result.HitTF = true;
result.ipoint = q;
result.face = i;
//m_log.Info("[FACE]:" + i.ToString());
//m_log.Info("[POINT]: " + q.ToString());
//m_log.Info("[DIST]: " + distance2.ToString());