Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor

author: meta7 2010-08-07 16:32:18 -0700
committer: meta7 2010-08-07 16:32:18 -0700
commit: 8d3a73d1263926a36ef088696109af56e0ef9c75 (patch)
tree: 460ec84b6d83c19a8ce73dbcab1f2c53918c6fb3 /OpenSim/Region/ScriptEngine/Shared
parent: Repair lsGetWindlightScene, the constant was added to the list as a uint, whi... (diff)
parent: Add search URL to Login Service (diff)
download: opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.zip
opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.gz
opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.bz2
opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index a711ebf..68b645e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9145,8 +9145,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                            return UUID.Zero.ToString();
                        }
                        reply = new LSL_Vector(
-                            info.RegionLocX / Constants.RegionSize,
+                            info.RegionLocX,
-                            info.RegionLocY / Constants.RegionSize,
+                            info.RegionLocY,
                            0).ToString();
                        break;
                    case 6: // DATA_SIM_STATUS
author	meta7	2010-08-07 16:32:18 -0700
committer	meta7	2010-08-07 16:32:18 -0700
commit	8d3a73d1263926a36ef088696109af56e0ef9c75 (patch)
tree	460ec84b6d83c19a8ce73dbcab1f2c53918c6fb3 /OpenSim/Region/ScriptEngine/Shared
parent	Repair lsGetWindlightScene, the constant was added to the list as a uint, whi... (diff)
parent	Add search URL to Login Service (diff)
download	opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.zip opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.gz opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.bz2 opensim-SC_OLD-8d3a73d1263926a36ef088696109af56e0ef9c75.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index a711ebf..68b645e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -9145,8 +9145,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
9145	return UUID.Zero.ToString();	9145	return UUID.Zero.ToString();
9146	}	9146	}
9147	reply = new LSL_Vector(	9147	reply = new LSL_Vector(
9148	info.RegionLocX / Constants.RegionSize,	9148	info.RegionLocX,
9149	info.RegionLocY / Constants.RegionSize,	9149	info.RegionLocY,
9150	0).ToString();	9150	0).ToString();
9151	break;	9151	break;
9152	case 6: // DATA_SIM_STATUS	9152	case 6: // DATA_SIM_STATUS