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

added one more command to the console help.

afrisby
Jeff Ames 2007-12-07 02:00:35 +00:00
parent 9326ee425b
commit a45118d35e
6 changed files with 19 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Framework/RegionInfo.cs
View File

@ -48,7 +48,6 @@ namespace OpenSim.Framework
public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
{ {
m_regionLocX = regionLocX; m_regionLocX = regionLocX;
m_regionLocY = regionLocY; m_regionLocY = regionLocY;
@ -83,7 +82,6 @@ namespace OpenSim.Framework
public string RemotingAddress; public string RemotingAddress;
public IPEndPoint ExternalEndPoint public IPEndPoint ExternalEndPoint
{ {
get get
@ -99,7 +97,6 @@ namespace OpenSim.Framework
// Reset for next check // Reset for next check
ia = null; ia = null;
// New method favors IPv4 // New method favors IPv4
foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
{ {
@ -111,7 +108,6 @@ namespace OpenSim.Framework
ia = Adr; ia = Adr;
break; break;
} }
} }
return new IPEndPoint(ia, m_internalEndPoint.Port); return new IPEndPoint(ia, m_internalEndPoint.Port);
@ -209,10 +205,10 @@ namespace OpenSim.Framework
return m_estateSettings; return m_estateSettings;
} }
} }
public ConfigurationMember configMember; public ConfigurationMember configMember;
public RegionInfo(string description, string filename) public RegionInfo(string description, string filename)
{ {
configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
@ -226,13 +222,10 @@ namespace OpenSim.Framework
public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) : public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) :
base(regionLocX, regionLocY, internalEndPoint, externalUri) base(regionLocX, regionLocY, internalEndPoint, externalUri)
{ {
} }
public RegionInfo() public RegionInfo()
{ {
} }
public RegionInfo(SearializableRegionInfo ConvertFrom) public RegionInfo(SearializableRegionInfo ConvertFrom)
{ {

4
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
View File

@ -39,6 +39,7 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
public void SetIniConfigSource(IniConfigSource configSource) public void SetIniConfigSource(IniConfigSource configSource)
{ {
} }
public RegionInfo[] LoadRegions() public RegionInfo[] LoadRegions()
{ {
string regionConfigPath = Path.Combine(Util.configDir(), "Regions"); string regionConfigPath = Path.Combine(Util.configDir(), "Regions");
@ -59,14 +60,11 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];
for (int i = 0; i < configFiles.Length; i++) for (int i = 0; i < configFiles.Length; i++)
{ {
RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]); RegionInfo regionInfo = new RegionInfo("REGION CONFIG #" + (i + 1), configFiles[i]);
regionInfos[i] = regionInfo; regionInfos[i] = regionInfo;
} }
return regionInfos; return regionInfos;
} }
} }
} }

4
OpenSim/Region/Application/OpenSimMain.cs
View File

@ -626,7 +626,7 @@ namespace OpenSim
m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive."); m_log.Error(" alert [First] [Last] [Message] - send an alert to a user. Case sensitive.");
m_log.Error(" alert general [Message] - send an alert to all users."); m_log.Error(" alert general [Message] - send an alert to all users.");
m_log.Error("backup - trigger a simulator backup"); m_log.Error("backup - trigger a simulator backup");
m_log.Error("change-region - sets the region that many of these commands affect."); m_log.Error("change-region [name] - sets the region that many of these commands affect.");
m_log.Error("command-script [filename] - Execute command in a file."); m_log.Error("command-script [filename] - Execute command in a file.");
m_log.Error("debug - debugging commands"); m_log.Error("debug - debugging commands");
m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)"); m_log.Error(" packet 0..255 - print incoming/outgoing packets (0=off)");
@ -638,6 +638,7 @@ namespace OpenSim
m_log.Error("permissions [true/false] - turn on/off permissions on the scene"); m_log.Error("permissions [true/false] - turn on/off permissions on the scene");
m_log.Error("quit - equivalent to shutdown."); m_log.Error("quit - equivalent to shutdown.");
m_log.Error("restart - disconnects all clients and restarts the sims in the instance."); m_log.Error("restart - disconnects all clients and restarts the sims in the instance.");
m_log.Error("remove-region [name] - remove a region");
m_log.Error("save-xml [filename] - save prims to XML"); m_log.Error("save-xml [filename] - save prims to XML");
m_log.Error("save-xml2 [filename] - save prims to XML using version 2 format"); m_log.Error("save-xml2 [filename] - save prims to XML using version 2 format");
m_log.Error("script - manually trigger scripts? or script commands?"); m_log.Error("script - manually trigger scripts? or script commands?");
@ -771,7 +772,6 @@ namespace OpenSim
} }
m_regionData.Remove(killScene.RegionInfo); m_regionData.Remove(killScene.RegionInfo);
m_sceneManager.CloseScene(killScene); m_sceneManager.CloseScene(killScene);
} }
break; break;

3
OpenSim/Region/Environment/Modules/SunModule.cs
View File

@ -152,7 +152,7 @@ namespace OpenSim.Region.Environment.Modules
// sunPhase = 12; // sunPhase = 12;
// } // }
// sunPhase = sunPhase - 12; // sunPhase = sunPhase - 12;
//
// float yValue = 0.1f*(sunPhase); // float yValue = 0.1f*(sunPhase);
// Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue); // Console.WriteLine("Computed SunPhase: {0}, yValue: {1}", sunPhase, yValue);
// if (yValue > 1.2f) // if (yValue > 1.2f)
@ -182,6 +182,5 @@ namespace OpenSim.Region.Environment.Modules
// viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch(); // viewertime.TimeInfo.UsecSinceStart = (ulong) Util.UnixTimeSinceEpoch();
// // OutPacket(viewertime); // // OutPacket(viewertime);
// } // }
} }
} }

40
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -77,7 +77,6 @@ namespace OpenSim.Region.Environment.Scenes
private LLVector3 lastPhysPos = new LLVector3(); private LLVector3 lastPhysPos = new LLVector3();
private int m_wearablesSerial = 1; private int m_wearablesSerial = 1;
// Position of agent's camera in world // Position of agent's camera in world
protected Vector3 m_CameraCenter = new Vector3(0, 0, 0); protected Vector3 m_CameraCenter = new Vector3(0, 0, 0);
@ -553,7 +552,7 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public void HandleAgentUpdate(IClientAPI remoteClient,AgentUpdatePacket agentData ) public void HandleAgentUpdate(IClientAPI remoteClient, AgentUpdatePacket agentData)
{ {
//if (m_isChildAgent) //if (m_isChildAgent)
//{ //{
@ -573,7 +572,6 @@ namespace OpenSim.Region.Environment.Scenes
m_CameraCenter.y = agentData.AgentData.CameraCenter.Y; m_CameraCenter.y = agentData.AgentData.CameraCenter.Y;
m_CameraCenter.z = agentData.AgentData.CameraCenter.Z; m_CameraCenter.z = agentData.AgentData.CameraCenter.Z;
// Use these three vectors to figure out what the agent is looking at // Use these three vectors to figure out what the agent is looking at
// Convert it to a Matrix and/or Quaternion // Convert it to a Matrix and/or Quaternion
m_CameraAtAxis.x = agentData.AgentData.CameraAtAxis.X; m_CameraAtAxis.x = agentData.AgentData.CameraAtAxis.X;
@ -632,7 +630,6 @@ namespace OpenSim.Region.Environment.Scenes
Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); Quaternion q = new Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
bool oldflying = PhysicsActor.Flying; bool oldflying = PhysicsActor.Flying;
PhysicsActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0); PhysicsActor.Flying = ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0);
if (PhysicsActor.Flying != oldflying) if (PhysicsActor.Flying != oldflying)
{ {
@ -883,10 +880,10 @@ namespace OpenSim.Region.Environment.Scenes
} }
NewForce newVelocity = new NewForce(); NewForce newVelocity = new NewForce();
Vector3 direc = rotation*vec; Vector3 direc = rotation * vec;
direc.Normalize(); direc.Normalize();
direc = direc*((0.03f)*128f); direc *= 0.03f * 128f;
if (m_physicsActor.Flying) if (m_physicsActor.Flying)
{ {
direc *= 4; direc *= 4;
@ -944,15 +941,12 @@ namespace OpenSim.Region.Environment.Scenes
if (m_isChildAgent == false) if (m_isChildAgent == false)
{ {
/// check for user movement 'forces' (ie commands to move) if (m_newForce) // user movement 'forces' (ie commands to move)
if (m_newForce)
{ {
SendTerseUpdateToAllClients(); SendTerseUpdateToAllClients();
m_updateCount = 0; m_updateCount = 0;
} }
else if (m_movementflag != 0) // scripted movement (?)
/// check for scripted movement (?)
else if (m_movementflag != 0)
{ {
m_updateCount++; m_updateCount++;
if (m_updateCount > 3) if (m_updateCount > 3)
@ -961,9 +955,7 @@ namespace OpenSim.Region.Environment.Scenes
m_updateCount = 0; m_updateCount = 0;
} }
} }
else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02) // physics-related movement
/// check for physics-related movement
else if (lastPhysPos.GetDistanceTo(AbsolutePosition) > 0.02)
{ {
SendTerseUpdateToAllClients(); SendTerseUpdateToAllClients();
m_updateCount = 0; m_updateCount = 0;
@ -1071,9 +1063,9 @@ namespace OpenSim.Region.Environment.Scenes
/// ///
/// </summary> /// </summary>
/// <param name="client"></param> /// <param name="client"></param>
public void SendOwnAppearance( ) public void SendOwnAppearance()
{ {
SendOwnWearables( ); SendOwnWearables();
// TODO: remove this once the SunModule is slightly more tested // TODO: remove this once the SunModule is slightly more tested
// m_controllingClient.SendViewerTime(m_scene.TimePhase); // m_controllingClient.SendViewerTime(m_scene.TimePhase);
@ -1224,7 +1216,6 @@ namespace OpenSim.Region.Environment.Scenes
#endregion #endregion
public void GrantGodlikePowers(LLUUID agentID, LLUUID sessionID, LLUUID token) public void GrantGodlikePowers(LLUUID agentID, LLUUID sessionID, LLUUID token)
{ {
GrantGodlikePowersPacket respondPacket = new GrantGodlikePowersPacket(); GrantGodlikePowersPacket respondPacket = new GrantGodlikePowersPacket();
@ -1240,10 +1231,8 @@ namespace OpenSim.Region.Environment.Scenes
respondPacket.GrantData = gdb; respondPacket.GrantData = gdb;
respondPacket.AgentData = adb; respondPacket.AgentData = adb;
ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task); ControllingClient.OutPacket(respondPacket, ThrottleOutPacketType.Task);
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -1267,7 +1256,6 @@ namespace OpenSim.Region.Environment.Scenes
m_updateflag = true; m_updateflag = true;
Velocity = new LLVector3(force.X, force.Y, force.Z); Velocity = new LLVector3(force.X, force.Y, force.Z);
m_newForce = true; m_newForce = true;
} }
@ -1317,7 +1305,6 @@ namespace OpenSim.Region.Environment.Scenes
} }
} }
public override void SetText(string text, Vector3 color, double alpha) public override void SetText(string text, Vector3 color, double alpha)
{ {
throw new Exception("Can't set Text on avatar."); throw new Exception("Can't set Text on avatar.");
@ -1335,14 +1322,13 @@ namespace OpenSim.Region.Environment.Scenes
m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients; m_physicsActor.OnRequestTerseUpdate += SendTerseUpdateToAllClients;
m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate; m_physicsActor.OnCollisionUpdate += PhysicsCollisionUpdate;
} }
private void PhysicsCollisionUpdate(EventArgs e) private void PhysicsCollisionUpdate(EventArgs e)
{ {
bool isUserMoving = false; bool isUserMoving = Velocity.X > 0 || Velocity.Y > 0;
if (Velocity.X > 0 || Velocity.Y > 0)
isUserMoving = true;
UpdateMovementAnimations(isUserMoving); UpdateMovementAnimations(isUserMoving);
} }
internal void Close() internal void Close()
{ {
RemoveFromPhysicalScene(); RemoveFromPhysicalScene();
@ -1352,13 +1338,11 @@ namespace OpenSim.Region.Environment.Scenes
{ {
m_wearables[wearableId] = wearable; m_wearables[wearableId] = wearable;
SendOwnWearables(); SendOwnWearables();
} }
private void SendOwnWearables() private void SendOwnWearables()
{ {
m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++); m_controllingClient.SendWearables(m_wearables, m_wearablesSerial++);
} }
} }
} }

9
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -34,7 +34,6 @@ using OpenSim.Framework.Communications.Cache;
using OpenSim.Framework.Servers; using OpenSim.Framework.Servers;
using OpenSim.Region.Environment; using OpenSim.Region.Environment;
using OpenSim.Region.Environment.Scenes; using OpenSim.Region.Environment.Scenes;
using Avatar=OpenSim.Region.Environment.Scenes.ScenePresence;
namespace SimpleApp namespace SimpleApp
{ {
@ -47,7 +46,7 @@ namespace SimpleApp
ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks) ModuleLoader moduleLoader, bool physicalPrim, bool ChildGetTasks)
: base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false) : base(regionInfo, authen, permissionManager, commsMan, sceneGridService, assetCach, storeMan, httpServer, moduleLoader, false, true, false)
{ {
m_avatars = new List<Avatar>(); m_avatars = new List<ScenePresence>();
} }
public override void LoadWorldMap() public override void LoadWorldMap()
@ -56,9 +55,6 @@ namespace SimpleApp
for (int i = 0; i < 65536; i++) for (int i = 0; i < 65536; i++)
{ {
//int x = i%256;
//int y = i/256;
map[i] = 25f; map[i] = 25f;
} }
@ -77,8 +73,7 @@ namespace SimpleApp
client.OnCompleteMovementToRegion += client.OnCompleteMovementToRegion +=
delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); }; delegate() { client.SendChatMessage("Welcome to My World.", 1, pos, "System", LLUUID.Zero); };
client.SendRegionHandshake(m_regInfo); client.SendRegionHandshake(m_regInfo);
} }
} }