aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorJeff Ames2009-06-10 04:28:56 +0000
committerJeff Ames2009-06-10 04:28:56 +0000
commita23d64dec1cbf88abc3c7e84664a683dee534e4a (patch)
tree7e85403f29839775209481ba7f6ee55aac56f209 /OpenSim/Region/CoreModules/Avatar
parentLetting the Flotsam cache be enabled even when [AssetCache] section is missin... (diff)
downloadopensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.zip
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.gz
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.bz2
opensim-SC-a23d64dec1cbf88abc3c7e84664a683dee534e4a.tar.xz
Formatting cleanup.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs6
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 8cc2655..66f1e14 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -116,7 +116,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
116 { 116 {
117 byte dialog = im.dialog; 117 byte dialog = im.dialog;
118 118
119 if ( dialog != (byte)InstantMessageDialog.MessageFromAgent 119 if (dialog != (byte)InstantMessageDialog.MessageFromAgent
120 && dialog != (byte)InstantMessageDialog.StartTyping 120 && dialog != (byte)InstantMessageDialog.StartTyping
121 && dialog != (byte)InstantMessageDialog.StopTyping 121 && dialog != (byte)InstantMessageDialog.StopTyping
122 && dialog != (byte)InstantMessageDialog.MessageFromObject) 122 && dialog != (byte)InstantMessageDialog.MessageFromObject)
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index 986f604..12f5d19 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -219,7 +219,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
219 else 219 else
220 { 220 {
221 if (m_TransferModule != null) 221 if (m_TransferModule != null)
222 m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); 222 m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
223 } 223 }
224 } 224 }
225 else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) 225 else if (im.dialog == (byte) InstantMessageDialog.InventoryAccepted)
@@ -233,7 +233,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
233 else 233 else
234 { 234 {
235 if (m_TransferModule != null) 235 if (m_TransferModule != null)
236 m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); 236 m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
237 } 237 }
238 } 238 }
239 else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) 239 else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined)
@@ -300,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
300 else 300 else
301 { 301 {
302 if (m_TransferModule != null) 302 if (m_TransferModule != null)
303 m_TransferModule.SendInstantMessage(im, delegate(bool success) {} ); 303 m_TransferModule.SendInstantMessage(im, delegate(bool success) {});
304 } 304 }
305 } 305 }
306 } 306 }