diff options
| author | Melanie | 2011-04-12 00:27:39 +0100 |
|---|---|---|
| committer | Melanie | 2011-04-12 00:27:39 +0100 |
| commit | 42b96a8be0e6cc754776058071fb60782ec05023 (patch) | |
| tree | f5e3f8e4b4e5c27ee5f83c5c3e9f2aae5bcf7e11 /OpenSim/Client | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | minor: add a bit more method doc to IInventoryService.GetItem() (diff) | |
| download | opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.zip opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.tar.gz opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.tar.bz2 opensim-SC_OLD-42b96a8be0e6cc754776058071fb60782ec05023.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Client')
| -rw-r--r-- | OpenSim/Client/MXP/ClientStack/MXPClientView.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs index ca7566e..7c347e6 100644 --- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs +++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs | |||
| @@ -66,8 +66,8 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 66 | private readonly IScene m_scene; | 66 | private readonly IScene m_scene; |
| 67 | private readonly string m_firstName; | 67 | private readonly string m_firstName; |
| 68 | private readonly string m_lastName; | 68 | private readonly string m_lastName; |
| 69 | private int m_objectsToSynchronize = 0; | 69 | // private int m_objectsToSynchronize = 0; |
| 70 | private int m_objectsSynchronized = -1; | 70 | // private int m_objectsSynchronized = -1; |
| 71 | 71 | ||
| 72 | private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); | 72 | private Vector3 m_startPosition=new Vector3(128f, 128f, 128f); |
| 73 | #endregion | 73 | #endregion |
| @@ -462,8 +462,8 @@ namespace OpenSim.Client.MXP.ClientStack | |||
| 462 | 462 | ||
| 463 | public void MXPSendSynchronizationBegin(int objectCount) | 463 | public void MXPSendSynchronizationBegin(int objectCount) |
| 464 | { | 464 | { |
| 465 | m_objectsToSynchronize = objectCount; | 465 | // m_objectsToSynchronize = objectCount; |
| 466 | m_objectsSynchronized = 0; | 466 | // m_objectsSynchronized = 0; |
| 467 | SynchronizationBeginEventMessage synchronizationBeginEventMessage = new SynchronizationBeginEventMessage(); | 467 | SynchronizationBeginEventMessage synchronizationBeginEventMessage = new SynchronizationBeginEventMessage(); |
| 468 | synchronizationBeginEventMessage.ObjectCount = (uint)objectCount; | 468 | synchronizationBeginEventMessage.ObjectCount = (uint)objectCount; |
| 469 | Session.Send(synchronizationBeginEventMessage); | 469 | Session.Send(synchronizationBeginEventMessage); |