* Removing set-time command since it doesn't actually do anything at all
* If this was crucial to someone then it should be reinsertable as a module0.6.2-post-fixes
parent
66637ad6e7
commit
feba3cc3ff
|
@ -235,10 +235,6 @@ namespace OpenSim
|
||||||
m_assetCache.Clear();
|
m_assetCache.Clear();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case "set-time":
|
|
||||||
m_sceneManager.SetCurrentSceneTimePhase(Convert.ToInt32(cmdparams[0]));
|
|
||||||
break;
|
|
||||||
|
|
||||||
case "force-update":
|
case "force-update":
|
||||||
m_console.Notice("Updating all clients");
|
m_console.Notice("Updating all clients");
|
||||||
m_sceneManager.ForceCurrentSceneClientUpdate();
|
m_sceneManager.ForceCurrentSceneClientUpdate();
|
||||||
|
@ -679,7 +675,6 @@ namespace OpenSim
|
||||||
m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region.");
|
m_console.Notice("load-oar [filename] - load an OpenSimulator region archive. This replaces everything in the current region.");
|
||||||
m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive.");
|
m_console.Notice("save-oar [filename] - Save the current region to an OpenSimulator region archive.");
|
||||||
m_console.Notice("script - manually trigger scripts? or script commands?");
|
m_console.Notice("script - manually trigger scripts? or script commands?");
|
||||||
m_console.Notice("set-time [x] - set the current scene time phase");
|
|
||||||
m_console.Notice("show assets - show state of asset cache.");
|
m_console.Notice("show assets - show state of asset cache.");
|
||||||
m_console.Notice("show modules - shows info about loaded modules.");
|
m_console.Notice("show modules - shows info about loaded modules.");
|
||||||
m_console.Notice("show queues - show packet queues length for all clients.");
|
m_console.Notice("show queues - show packet queues length for all clients.");
|
||||||
|
|
|
@ -80,8 +80,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
/// TODO: Possibly stop other classes being able to manipulate this directly.
|
/// TODO: Possibly stop other classes being able to manipulate this directly.
|
||||||
public SceneGraph m_sceneGraph;
|
public SceneGraph m_sceneGraph;
|
||||||
|
|
||||||
private int m_timePhase = 24;
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Are we applying physics to any of the prims in this scene?
|
/// Are we applying physics to any of the prims in this scene?
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -245,11 +243,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
get { return StatsReporter.getLastReportedSimFPS(); }
|
get { return StatsReporter.getLastReportedSimFPS(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
public int TimePhase
|
|
||||||
{
|
|
||||||
get { return m_timePhase; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public string DefaultScriptEngine
|
public string DefaultScriptEngine
|
||||||
{
|
{
|
||||||
get { return m_defaultScriptEngine; }
|
get { return m_defaultScriptEngine; }
|
||||||
|
@ -3356,15 +3349,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
|
|
||||||
#region Other Methods
|
#region Other Methods
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
///
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="phase"></param>
|
|
||||||
public void SetTimePhase(int phase)
|
|
||||||
{
|
|
||||||
m_timePhase = phase;
|
|
||||||
}
|
|
||||||
|
|
||||||
public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms)
|
public virtual void StoreAddFriendship(UUID ownerID, UUID friendID, uint perms)
|
||||||
{
|
{
|
||||||
m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
|
m_sceneGridService.AddNewUserFriend(ownerID, friendID, perms);
|
||||||
|
|
|
@ -483,16 +483,6 @@ namespace OpenSim.Region.Environment.Scenes
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetCurrentSceneTimePhase(int timePhase)
|
|
||||||
{
|
|
||||||
ForEachCurrentScene(delegate(Scene scene)
|
|
||||||
{
|
|
||||||
scene.SetTimePhase(
|
|
||||||
timePhase)
|
|
||||||
;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ForceCurrentSceneClientUpdate()
|
public void ForceCurrentSceneClientUpdate()
|
||||||
{
|
{
|
||||||
ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });
|
ForEachCurrentScene(delegate(Scene scene) { scene.ForceClientUpdate(); });
|
||||||
|
|
Loading…
Reference in New Issue