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

Removed RegionSyncMessages that are no longer in use, and some other code that have been commented out.

dsg
Huaiyu (Kitty) Liu 2011-05-12 09:38:03 -07:00
parent ef66b29e95
commit 33fe1e9f76
5 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnector.cs
View File

@ -90,9 +90,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
private long m_messagesSent = 0; private long m_messagesSent = 0;
private long m_messagesReceived = 0; private long m_messagesReceived = 0;
//private QuarkSubsriptionInfo m_subscribedQuarks;
private IConfig m_sysConfig; private IConfig m_sysConfig;
//members for load balancing purpose //members for load balancing purpose
@ -121,9 +118,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
SceneToPhysEngineSyncServer.logEnabled = m_sysConfig.GetBoolean("PhysLogEnabled", false); SceneToPhysEngineSyncServer.logEnabled = m_sysConfig.GetBoolean("PhysLogEnabled", false);
SceneToPhysEngineSyncServer.logDir = m_sysConfig.GetString("PhysLogDir", "."); SceneToPhysEngineSyncServer.logDir = m_sysConfig.GetString("PhysLogDir", ".");
//assume we are connecting to the whole scene as one big quark
//m_subscribedQuarks = new QuarkSubsriptionInfo(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize);
} }
// Start the RegionSyncPhysEngine client thread // Start the RegionSyncPhysEngine client thread
@ -172,19 +166,10 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.ActorStatus, Convert.ToString((int)ActorStatus.Sync)); RegionSyncMessage msg = new RegionSyncMessage(RegionSyncMessage.MsgType.ActorStatus, Convert.ToString((int)ActorStatus.Sync));
Send(msg); Send(msg);
// SendQuarkSubscription();
Thread.Sleep(100); Thread.Sleep(100);
DoInitialSync(); DoInitialSync();
} }
/*
public void SetQuarkSubscription(QuarkSubsriptionInfo quarks)
{
m_subscribedQuarks = quarks;
}
* */
public void RegisterIdle() public void RegisterIdle()
{ {
EstablishConnection(); EstablishConnection();

16
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/PhysEngineToSceneConnectorModule.cs
View File

@ -298,18 +298,9 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
Command cmdSyncStatus = new Command("status", CommandIntentions.COMMAND_HAZARDOUS, SyncStatus, "Displays synchronization status."); Command cmdSyncStatus = new Command("status", CommandIntentions.COMMAND_HAZARDOUS, SyncStatus, "Displays synchronization status.");
//The following two commands are more for easier debugging purpose
//Command cmdSyncSetQuarks = new Command("quarkSpace", CommandIntentions.COMMAND_HAZARDOUS, SetQuarkList, "Set the set of quarks to subscribe to. For debugging purpose. Should be issued before \"sync start\"");
//cmdSyncSetQuarks.AddArgument("quarkSpace", "The (rectangle) space of quarks to subscribe, represented by x0_y0,x1_y1, the left-bottom and top-right corners of the rectangel space", "String");
//Command cmdSyncSetQuarkSize = new Command("quarksize", CommandIntentions.COMMAND_HAZARDOUS, SetQuarkSize, "Set the size of each quark. For debugging purpose. Should be issued before \"sync quarks\"");
//cmdSyncSetQuarkSize.AddArgument("quarksizeX", "The size on x axis of each quark", "Integer");
//cmdSyncSetQuarkSize.AddArgument("quarksizeY", "The size on y axis of each quark", "Integer");
m_commander.RegisterCommand("start", cmdSyncStart); m_commander.RegisterCommand("start", cmdSyncStart);
m_commander.RegisterCommand("stop", cmdSyncStop); m_commander.RegisterCommand("stop", cmdSyncStop);
m_commander.RegisterCommand("status", cmdSyncStatus); m_commander.RegisterCommand("status", cmdSyncStatus);
//m_commander.RegisterCommand("quarkSpace", cmdSyncSetQuarks);
lock (m_scene) lock (m_scene)
{ {
@ -361,13 +352,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
} }
} }
private void SetQuarkList(Object[] args)
{
m_subscriptionSpaceString = (string)args[0];
InitPhysEngineToSceneConnector(m_subscriptionSpaceString);
}
private void InitPhysEngineToSceneConnector(string space) private void InitPhysEngineToSceneConnector(string space)
{ {

9
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncMessage.cs
View File

@ -110,7 +110,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
OnRezScript, OnRezScript,
OnScriptReset, OnScriptReset,
OnUpdateScript, OnUpdateScript,
QuarkSubscription,
// Scene -> Script Engine // Scene -> Script Engine
NewObjectWithScript, NewObjectWithScript,
SceneLocation, SceneLocation,
@ -124,14 +123,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
LoadMigrationNotice, LoadMigrationNotice,
LoadBalanceResponse, LoadBalanceResponse,
LoadBalanceRejection, LoadBalanceRejection,
//Overloaded script engine overloaded -> idle script engine
//MigratingQuarks,
MigrationSpace,
ScriptStateSyncStart,
ScriptStateSyncPerObject,
ScriptStateSyncEnd,
//Idle script engine overloaded -> overloaded script engine
ScriptStateSyncRequest,
// Physics Engine -> Scene // Physics Engine -> Scene
PhysTerseUpdate, PhysTerseUpdate,
PhysOutOfBounds, PhysOutOfBounds,

1
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SceneToPhysEngineSyncServer.cs
View File

@ -131,7 +131,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
// m_commander.RegisterCommand("start", cmdSyncStart); // m_commander.RegisterCommand("start", cmdSyncStart);
// m_commander.RegisterCommand("stop", cmdSyncStop); // m_commander.RegisterCommand("stop", cmdSyncStop);
m_commander.RegisterCommand("status", cmdSyncStatus); m_commander.RegisterCommand("status", cmdSyncStatus);
// m_commander.RegisterCommand("quarkSpace", cmdSyncSetQuarks);
lock (m_scene) lock (m_scene)
{ {

3
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/SymmetricSync/RegionSyncModule.cs
View File

@ -745,9 +745,6 @@ namespace OpenSim.Region.CoreModules.RegionSync.RegionSyncModule
{ {
SceneObjectGroup sog = (SceneObjectGroup)e; SceneObjectGroup sog = (SceneObjectGroup)e;
//if (connector.IsPositionInSyncQuarks(sog.AbsolutePosition))
//{
//SymmetricSyncMessage syncMsg = NewObjectMessageEncoder(sog); //SymmetricSyncMessage syncMsg = NewObjectMessageEncoder(sog);
OSDMap encodedSOG = SceneObjectEncoder(sog); OSDMap encodedSOG = SceneObjectEncoder(sog);
SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, OSDParser.SerializeJsonString(encodedSOG)); SymmetricSyncMessage syncMsg = new SymmetricSyncMessage(SymmetricSyncMessage.MsgType.NewObject, OSDParser.SerializeJsonString(encodedSOG));