Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

4 files changed, 9 insertions, 7 deletions

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 87fd3f0..9aa5d03 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -98,10 +98,10 @@ namespace OpenSim.Framework
                                                 "True", 
                                                 false);            
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access user name [Default: disabled]", "0", false);
+                                                 "Remote console access user name [Default: disabled]", "", false);
 
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                 "Remote console access password [Default: disabled]", "0", false);
+                                                 "Remote console access password [Default: disabled]", "", false);
 
         }
 
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index 61e5ea7..884c0ea 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -91,10 +91,10 @@ namespace OpenSim.Framework
             m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
                                                 "My Published IP Address", "127.0.0.1", false);
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "0", false);
+                                                "Remote console access user name [Default: disabled]", "", false);
 
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "0", false);
+                                                "Remote console access password [Default: disabled]", "", false);
 
         }
 
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index b9e3665..16f265c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -158,10 +158,10 @@ namespace OpenSim.Framework
                                                 "Minimum Level a user should have to login [0 default]", "0", false);
             
             m_configMember.addConfigurationOption("console_user", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access user name [Default: disabled]", "0", false);
+                                                "Remote console access user name [Default: disabled]", "", false);
             
             m_configMember.addConfigurationOption("console_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
-                                                "Remote console access password [Default: disabled]", "0", false);
+                                                "Remote console access password [Default: disabled]", "", false);
             
         }
 
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 6969a3d..a7a5aa3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -2177,7 +2177,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
                 bulkUpdate.AgentData.AgentID = AgentId;
                 bulkUpdate.AgentData.TransactionID = transactionId;
                 bulkUpdate.FolderData = folderDataBlocks.ToArray();
-
+                List<BulkUpdateInventoryPacket.ItemDataBlock> foo = new List<BulkUpdateInventoryPacket.ItemDataBlock>();
+                bulkUpdate.ItemData = foo.ToArray();
+ 
                 //m_log.Debug("SendBulkUpdateInventory :" + bulkUpdate);
                 OutPacket(bulkUpdate, ThrottleOutPacketType.Asset);
             }