aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2009-09-03 12:42:25 -0700
committerDiva Canto2009-09-03 12:42:25 -0700
commit639bf79aec2e6c7cb0bd660d80978248f1c4f6c0 (patch)
tree6a5f7c1ebf9c40d946a2cca249f9dce92ac81faf
parentFixes seven leaky .BeginInvoke() calls (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.zip
opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.gz
opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.bz2
opensim-SC_OLD-639bf79aec2e6c7cb0bd660d80978248f1c4f6c0.tar.xz
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
-rw-r--r--.nant/local.include38
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs5
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs51
-rw-r--r--bin/OpenSim.ConsoleClient.ini.example13
-rwxr-xr-xnant-color3
5 files changed, 65 insertions, 45 deletions
diff --git a/.nant/local.include b/.nant/local.include
index 510bdc6..58d1ad1 100644
--- a/.nant/local.include
+++ b/.nant/local.include
@@ -34,51 +34,55 @@
34 <setenv name="MONO_THREADS_PER_CPU" value="100" /> 34 <setenv name="MONO_THREADS_PER_CPU" value="100" />
35 35
36 <!-- Unit Test Assembly --> 36 <!-- Unit Test Assembly -->
37 <!-- if you want to add more unit tests it's important that you add
38 the assembly here as an exec, and you add the fail clause later.
39 This lets all the unit tests run and tells you if they fail at the
40 end, instead of stopping short -->
37 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests"> 41 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.tests">
38 <arg value="./bin/OpenSim.Framework.Tests.dll" /> 42 <arg value="./bin/OpenSim.Framework.Tests.dll" />
39 </exec> 43 </exec>
40 44
41 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests"> 45 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.communications.tests">
42 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" /> 46 <arg value="./bin/OpenSim.Framework.Communications.Tests.dll" />
43 </exec> 47 </exec>
44 48
45 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests"> 49 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.framework.servers.tests">
46 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" /> 50 <arg value="./bin/OpenSim.Framework.Servers.Tests.dll" />
47 </exec> 51 </exec>
48 52
49 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests"> 53 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.clientstack.lindenudp.tests">
50 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" /> 54 <arg value="./bin/OpenSim.Region.ClientStack.LindenUDP.Tests.dll" />
51 </exec> 55 </exec>
52 56
53 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests"> 57 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.scriptengine.tests">
54 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" /> 58 <arg value="./bin/OpenSim.Region.ScriptEngine.Tests.dll" />
55 </exec> 59 </exec>
56 60
57 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests"> 61 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.coremodules.tests">
58 <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" /> 62 <arg value="./bin/OpenSim.Region.CoreModules.Tests.dll" />
59 </exec> 63 </exec>
60 64
61 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests"> 65 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.region.framework.tests">
62 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" /> 66 <arg value="./bin/OpenSim.Region.Framework.Tests.dll" />
63 </exec> 67 </exec>
64 68
65 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests"> 69 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.sqlite.tests">
66 <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" /> 70 <arg value="./bin/OpenSim.Data.SQLite.Tests.dll" />
67 </exec> 71 </exec>
68 72
69 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests"> 73 <exec program="${nunitcmd}" failonerror="false" resultproperty="testresult.opensim.data.mysql.tests">
70 <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" /> 74 <arg value="./bin/OpenSim.Data.MySQL.Tests.dll" />
71 </exec> 75 </exec>
72 76
73 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" /> 77 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" />
74 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.communications.tests)==0}" /> 78 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.tests)==0}" />
75 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" /> 79 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" />
76 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" /> 80 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" />
77 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" /> 81 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" />
78 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" /> 82 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.coremodules.tests)==0}" />
79 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.framework.tests)==0}" /> 83 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.clientstack.lindenudp.tests)==0}" />
80 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.sqlite.tests)==0}" /> 84 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.region.scriptengine.tests)==0}" />
81 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.data.mysql.tests)==0}" /> 85 <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.framework.servers.tests)==0}" />
82 86
83</target> 87</target>
84 88
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 4ee90e2..f73a7e3 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -199,6 +199,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
199 InventoryFolderImpl inventoryFolder = null; 199 InventoryFolderImpl inventoryFolder = null;
200 InventoryItemBase inventoryItem = null; 200 InventoryItemBase inventoryItem = null;
201 201
202 /*
202 if (!m_userInfo.HasReceivedInventory) 203 if (!m_userInfo.HasReceivedInventory)
203 { 204 {
204 // If the region server has access to the user admin service (by which users are created), 205 // If the region server has access to the user admin service (by which users are created),
@@ -220,13 +221,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
220 m_userInfo.FetchInventory(); 221 m_userInfo.FetchInventory();
221 } 222 }
222 } 223 }
224 */
223 225
224 bool foundStar = false; 226 bool foundStar = false;
225 227
226 // Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl 228 // Eliminate double slashes and any leading / on the path. This might be better done within InventoryFolderImpl
227 // itself (possibly at a small loss in efficiency). 229 // itself (possibly at a small loss in efficiency).
228 string[] components 230 string[] components
229 = m_invPath.Split(new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries); 231 = m_invPath.Split(
232 new string[] { InventoryFolderImpl.PATH_DELIMITER }, StringSplitOptions.RemoveEmptyEntries);
230 233
231 int maxComponentIndex = components.Length - 1; 234 int maxComponentIndex = components.Length - 1;
232 235
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index d3ba5fe..c495e02 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -64,6 +64,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
64 /// </value> 64 /// </value>
65 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>(); 65 private Dictionary<UUID, Scene> m_scenes = new Dictionary<UUID, Scene>();
66 private Scene m_aScene; 66 private Scene m_aScene;
67
67 /// <value> 68 /// <value>
68 /// The comms manager we will use for all comms requests 69 /// The comms manager we will use for all comms requests
69 /// </value> 70 /// </value>
@@ -110,8 +111,30 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
110 InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; 111 InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
111 if (handlerInventoryArchiveSaved != null) 112 if (handlerInventoryArchiveSaved != null)
112 handlerInventoryArchiveSaved(succeeded, userInfo, invPath, saveStream, reportedException); 113 handlerInventoryArchiveSaved(succeeded, userInfo, invPath, saveStream, reportedException);
114 }
115
116 public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream)
117 {
118 if (m_scenes.Count > 0)
119 {
120 CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
121
122 if (userInfo != null)
123 new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute();
124 }
125 }
126
127 public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath)
128 {
129 if (m_scenes.Count > 0)
130 {
131 CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
132
133 if (userInfo != null)
134 new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute();
135 }
113 } 136 }
114 137
115 public void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream) 138 public void DearchiveInventory(string firstName, string lastName, string invPath, Stream loadStream)
116 { 139 {
117 if (m_scenes.Count > 0) 140 if (m_scenes.Count > 0)
@@ -125,18 +148,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
125 UpdateClientWithLoadedNodes(userInfo, request.Execute()); 148 UpdateClientWithLoadedNodes(userInfo, request.Execute());
126 } 149 }
127 } 150 }
128 } 151 }
129
130 public void ArchiveInventory(string firstName, string lastName, string invPath, Stream saveStream)
131 {
132 if (m_scenes.Count > 0)
133 {
134 CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
135
136 if (userInfo != null)
137 new InventoryArchiveWriteRequest(this, userInfo, invPath, saveStream).Execute();
138 }
139 }
140 152
141 public void DearchiveInventory(string firstName, string lastName, string invPath, string loadPath) 153 public void DearchiveInventory(string firstName, string lastName, string invPath, string loadPath)
142 { 154 {
@@ -151,18 +163,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
151 UpdateClientWithLoadedNodes(userInfo, request.Execute()); 163 UpdateClientWithLoadedNodes(userInfo, request.Execute());
152 } 164 }
153 } 165 }
154 } 166 }
155
156 public void ArchiveInventory(string firstName, string lastName, string invPath, string savePath)
157 {
158 if (m_scenes.Count > 0)
159 {
160 CachedUserInfo userInfo = GetUserInfo(firstName, lastName);
161
162 if (userInfo != null)
163 new InventoryArchiveWriteRequest(this, userInfo, invPath, savePath).Execute();
164 }
165 }
166 167
167 /// <summary> 168 /// <summary>
168 /// Load inventory from an inventory file archive 169 /// Load inventory from an inventory file archive
diff --git a/bin/OpenSim.ConsoleClient.ini.example b/bin/OpenSim.ConsoleClient.ini.example
index beea7d8..5223d1d 100644
--- a/bin/OpenSim.ConsoleClient.ini.example
+++ b/bin/OpenSim.ConsoleClient.ini.example
@@ -1 +1,14 @@
1[Startup] 1[Startup]
2 ; Set here or use the -user command-line switch
3 ;user = Test
4
5 ; Set here or use the -host command-line switch
6 ;host = localhost
7
8 ; Set here or use the -port command-line switch
9 ;port = 8003
10
11 ; Set here or use the -pass command-line switch
12 ; Please be aware that this is not secure since the password is in the clear
13 ; we recommend the use of -pass wherever possible
14 ;pass = secret
diff --git a/nant-color b/nant-color
index c4cebb0..b368986 100755
--- a/nant-color
+++ b/nant-color
@@ -1,5 +1,4 @@
1#!/usr/bin/ruby 1#!/usr/bin/env ruby
2
3 2
4def main 3def main
5 IO.popen("nant #{ARGV.join(' ')}") { |pipe| 4 IO.popen("nant #{ARGV.join(' ')}") { |pipe|