diff options
author | Melanie | 2012-07-28 00:39:36 +0100 |
---|---|---|
committer | Melanie | 2012-07-28 00:39:36 +0100 |
commit | 771d79e83e9ef5686aee5fe1c572673cff291083 (patch) | |
tree | b37749fc1929ffd6dd1b9c2c4e29120accf26b99 /prebuild.xml | |
parent | Merge branch 'master' into careminster (diff) | |
parent | LSL/OSSL lacks Math.Min & Math.Max implementations. (diff) | |
download | opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.zip opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.gz opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.bz2 opensim-SC_OLD-771d79e83e9ef5686aee5fe1c572673cff291083.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
Diffstat (limited to 'prebuild.xml')
-rw-r--r-- | prebuild.xml | 86 |
1 files changed, 63 insertions, 23 deletions
diff --git a/prebuild.xml b/prebuild.xml index 52a91c3..469ca99 100644 --- a/prebuild.xml +++ b/prebuild.xml | |||
@@ -112,7 +112,37 @@ | |||
112 | </Files> | 112 | </Files> |
113 | </Project> | 113 | </Project> |
114 | 114 | ||
115 | <<<<<<< HEAD:prebuild.xml | ||
115 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> | 116 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> |
117 | ======= | ||
118 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Monitoring" path="OpenSim/Framework/Monitoring" type="Library"> | ||
119 | <Configuration name="Debug"> | ||
120 | <Options> | ||
121 | <OutputPath>../../../bin/</OutputPath> | ||
122 | </Options> | ||
123 | </Configuration> | ||
124 | <Configuration name="Release"> | ||
125 | <Options> | ||
126 | <OutputPath>../../../bin/</OutputPath> | ||
127 | </Options> | ||
128 | </Configuration> | ||
129 | |||
130 | <ReferencePath>../../../bin/</ReferencePath> | ||
131 | <Reference name="System"/> | ||
132 | <Reference name="System.Core"/> | ||
133 | <Reference name="log4net" path="../../../bin/"/> | ||
134 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | ||
135 | <Reference name="OpenMetaverse" path="../../../bin/"/> | ||
136 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | ||
137 | <Reference name="OpenSim.Framework"/> | ||
138 | |||
139 | <Files> | ||
140 | <Match pattern="*.cs" recurse="true"/> | ||
141 | </Files> | ||
142 | </Project> | ||
143 | |||
144 | <Project frameworkVersion="v3_5" name="OpenSim.Framework.Servers.HttpServer" path="OpenSim/Framework/Servers/HttpServer" type="Library"> | ||
145 | >>>>>>> master:prebuild.xml | ||
116 | <Configuration name="Debug"> | 146 | <Configuration name="Debug"> |
117 | <Options> | 147 | <Options> |
118 | <OutputPath>../../../../bin/</OutputPath> | 148 | <OutputPath>../../../../bin/</OutputPath> |
@@ -130,6 +160,7 @@ | |||
130 | <Reference name="System.Xml"/> | 160 | <Reference name="System.Xml"/> |
131 | <Reference name="System.Web"/> | 161 | <Reference name="System.Web"/> |
132 | <Reference name="OpenSim.Framework"/> | 162 | <Reference name="OpenSim.Framework"/> |
163 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
133 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> | 164 | <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/> |
134 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> | 165 | <Reference name="OpenMetaverseTypes" path="../../../../bin/"/> |
135 | <Reference name="XMLRPC" path="../../../../bin/"/> | 166 | <Reference name="XMLRPC" path="../../../../bin/"/> |
@@ -235,6 +266,7 @@ | |||
235 | </Files> | 266 | </Files> |
236 | </Project> | 267 | </Project> |
237 | 268 | ||
269 | <<<<<<< HEAD:prebuild.xml | ||
238 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library"> | 270 | <Project frameworkVersion="v4_0" name="OpenSim.Framework.Statistics" path="OpenSim/Framework/Statistics" type="Library"> |
239 | <Configuration name="Debug"> | 271 | <Configuration name="Debug"> |
240 | <Options> | 272 | <Options> |
@@ -260,6 +292,9 @@ | |||
260 | </Project> | 292 | </Project> |
261 | 293 | ||
262 | <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library"> | 294 | <Project frameworkVersion="v4_0" name="OpenSim.Data" path="OpenSim/Data" type="Library"> |
295 | ======= | ||
296 | <Project frameworkVersion="v3_5" name="OpenSim.Data" path="OpenSim/Data" type="Library"> | ||
297 | >>>>>>> master:prebuild.xml | ||
263 | <Configuration name="Debug"> | 298 | <Configuration name="Debug"> |
264 | <Options> | 299 | <Options> |
265 | <OutputPath>../../bin/</OutputPath> | 300 | <OutputPath>../../bin/</OutputPath> |
@@ -436,7 +471,7 @@ | |||
436 | <Reference name="OpenSim.Framework"/> | 471 | <Reference name="OpenSim.Framework"/> |
437 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 472 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
438 | <Reference name="OpenSim.Framework.Console"/> | 473 | <Reference name="OpenSim.Framework.Console"/> |
439 | <Reference name="OpenSim.Framework.Statistics"/> | 474 | <Reference name="OpenSim.Framework.Monitoring"/> |
440 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 475 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
441 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 476 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
442 | <Reference name="XMLRPC" path="../../../bin/"/> | 477 | <Reference name="XMLRPC" path="../../../bin/"/> |
@@ -720,9 +755,9 @@ | |||
720 | <Reference name="System.Xml"/> | 755 | <Reference name="System.Xml"/> |
721 | <Reference name="System.Web"/> | 756 | <Reference name="System.Web"/> |
722 | <Reference name="OpenSim.Framework"/> | 757 | <Reference name="OpenSim.Framework"/> |
758 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
723 | <Reference name="OpenSim.Framework.Servers"/> | 759 | <Reference name="OpenSim.Framework.Servers"/> |
724 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 760 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
725 | <Reference name="OpenSim.Framework.Statistics"/> | ||
726 | <Reference name="OpenSim.Services.Interfaces"/> | 761 | <Reference name="OpenSim.Services.Interfaces"/> |
727 | <Reference name="OpenMetaverse" path="../../bin/"/> | 762 | <Reference name="OpenMetaverse" path="../../bin/"/> |
728 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> | 763 | <Reference name="OpenMetaverseTypes" path="../../bin/"/> |
@@ -754,13 +789,13 @@ | |||
754 | <Reference name="System"/> | 789 | <Reference name="System"/> |
755 | <Reference name="System.Xml"/> | 790 | <Reference name="System.Xml"/> |
756 | <Reference name="System.Web"/> | 791 | <Reference name="System.Web"/> |
792 | <Reference name="OpenSim.Data"/> | ||
757 | <Reference name="OpenSim.Framework"/> | 793 | <Reference name="OpenSim.Framework"/> |
758 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> | 794 | <Reference name="OpenSim.Framework.AssetLoader.Filesystem"/> |
759 | <Reference name="OpenSim.Data"/> | 795 | <Reference name="OpenSim.Framework.Console"/> |
796 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
760 | <Reference name="OpenSim.Framework.Servers"/> | 797 | <Reference name="OpenSim.Framework.Servers"/> |
761 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 798 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
762 | <Reference name="OpenSim.Framework.Console"/> | ||
763 | <Reference name="OpenSim.Framework.Statistics"/> | ||
764 | <Reference name="OpenSim.Services.Interfaces"/> | 799 | <Reference name="OpenSim.Services.Interfaces"/> |
765 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> | 800 | <Reference name="OpenMetaverseTypes" path="../../../bin/"/> |
766 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> | 801 | <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> |
@@ -806,10 +841,10 @@ | |||
806 | <Reference name="OpenSim.Framework.Communications"/> | 841 | <Reference name="OpenSim.Framework.Communications"/> |
807 | <Reference name="OpenSim.Data"/> | 842 | <Reference name="OpenSim.Data"/> |
808 | <Reference name="OpenSim.Framework.Console"/> | 843 | <Reference name="OpenSim.Framework.Console"/> |
844 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
809 | <Reference name="OpenSim.Framework.Serialization"/> | 845 | <Reference name="OpenSim.Framework.Serialization"/> |
810 | <Reference name="OpenSim.Framework.Servers"/> | 846 | <Reference name="OpenSim.Framework.Servers"/> |
811 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 847 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
812 | <Reference name="OpenSim.Framework.Statistics"/> | ||
813 | <Reference name="OpenSim.Region.Physics.Manager"/> | 848 | <Reference name="OpenSim.Region.Physics.Manager"/> |
814 | 849 | ||
815 | <!-- For scripting in funny languages by default --> | 850 | <!-- For scripting in funny languages by default --> |
@@ -1525,10 +1560,10 @@ | |||
1525 | <Reference name="OpenSim.Framework"/> | 1560 | <Reference name="OpenSim.Framework"/> |
1526 | <Reference name="OpenSim.Framework.Communications"/> | 1561 | <Reference name="OpenSim.Framework.Communications"/> |
1527 | <Reference name="OpenSim.Framework.Console"/> | 1562 | <Reference name="OpenSim.Framework.Console"/> |
1563 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1528 | <Reference name="OpenSim.Framework.Serialization"/> | 1564 | <Reference name="OpenSim.Framework.Serialization"/> |
1529 | <Reference name="OpenSim.Framework.Servers"/> | 1565 | <Reference name="OpenSim.Framework.Servers"/> |
1530 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1566 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1531 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1532 | <Reference name="OpenSim.Region.Framework"/> | 1567 | <Reference name="OpenSim.Region.Framework"/> |
1533 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1568 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1534 | <Reference name="OpenSim.Server.Base"/> | 1569 | <Reference name="OpenSim.Server.Base"/> |
@@ -1616,11 +1651,11 @@ | |||
1616 | <Reference name="OpenSim.Region.Framework"/> | 1651 | <Reference name="OpenSim.Region.Framework"/> |
1617 | <Reference name="OpenSim.Framework"/> | 1652 | <Reference name="OpenSim.Framework"/> |
1618 | <Reference name="OpenSim.Data"/> | 1653 | <Reference name="OpenSim.Data"/> |
1654 | <Reference name="OpenSim.Framework.Console"/> | ||
1655 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1619 | <Reference name="OpenSim.Framework.Servers"/> | 1656 | <Reference name="OpenSim.Framework.Servers"/> |
1620 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1657 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1621 | <Reference name="OpenSim.Framework.Console"/> | ||
1622 | <Reference name="OpenSim.Framework.Communications"/> | 1658 | <Reference name="OpenSim.Framework.Communications"/> |
1623 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1624 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1659 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1625 | <Reference name="XMLRPC" path="../../../bin/"/> | 1660 | <Reference name="XMLRPC" path="../../../bin/"/> |
1626 | <Reference name="Nini" path="../../../bin/"/> | 1661 | <Reference name="Nini" path="../../../bin/"/> |
@@ -1653,15 +1688,15 @@ | |||
1653 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | 1688 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
1654 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> | 1689 | <Reference name="OpenMetaverse.StructuredData" path="../../../../../bin/"/> |
1655 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> | 1690 | <Reference name="OpenMetaverse" path="../../../../../bin/"/> |
1656 | <Reference name="OpenSim.Region.Framework"/> | ||
1657 | <Reference name="OpenSim.Framework"/> | ||
1658 | <Reference name="OpenSim.Data"/> | 1691 | <Reference name="OpenSim.Data"/> |
1692 | <Reference name="OpenSim.Framework"/> | ||
1693 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1659 | <Reference name="OpenSim.Framework.Servers"/> | 1694 | <Reference name="OpenSim.Framework.Servers"/> |
1660 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1695 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1661 | <Reference name="OpenSim.Framework.Console"/> | 1696 | <Reference name="OpenSim.Framework.Console"/> |
1662 | <Reference name="OpenSim.Framework.Communications"/> | 1697 | <Reference name="OpenSim.Framework.Communications"/> |
1663 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1664 | <Reference name="OpenSim.Region.ClientStack"/> | 1698 | <Reference name="OpenSim.Region.ClientStack"/> |
1699 | <Reference name="OpenSim.Region.Framework"/> | ||
1665 | <Reference name="OpenSim.Services.Interfaces"/> | 1700 | <Reference name="OpenSim.Services.Interfaces"/> |
1666 | <Reference name="Nini" path="../../../../../bin/"/> | 1701 | <Reference name="Nini" path="../../../../../bin/"/> |
1667 | <Reference name="log4net" path="../../../../../bin/"/> | 1702 | <Reference name="log4net" path="../../../../../bin/"/> |
@@ -1744,9 +1779,9 @@ | |||
1744 | <Reference name="OpenSim.Framework.Communications"/> | 1779 | <Reference name="OpenSim.Framework.Communications"/> |
1745 | <Reference name="OpenSim.Data"/> | 1780 | <Reference name="OpenSim.Data"/> |
1746 | <Reference name="OpenSim.Framework.Console"/> | 1781 | <Reference name="OpenSim.Framework.Console"/> |
1782 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
1747 | <Reference name="OpenSim.Framework.Servers"/> | 1783 | <Reference name="OpenSim.Framework.Servers"/> |
1748 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1784 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1749 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1750 | <Reference name="OpenSim.Region.CoreModules"/> | 1785 | <Reference name="OpenSim.Region.CoreModules"/> |
1751 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 1786 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
1752 | <Reference name="OpenSim.Region.Framework"/> | 1787 | <Reference name="OpenSim.Region.Framework"/> |
@@ -1882,15 +1917,15 @@ | |||
1882 | <Reference name="OpenMetaverse" path="../../../bin/"/> | 1917 | <Reference name="OpenMetaverse" path="../../../bin/"/> |
1883 | <Reference name="OpenSim.Framework"/> | 1918 | <Reference name="OpenSim.Framework"/> |
1884 | <Reference name="OpenSim.Data"/> | 1919 | <Reference name="OpenSim.Data"/> |
1920 | <Reference name="OpenSim.Framework.Communications"/> | ||
1885 | <Reference name="OpenSim.Framework.Console"/> | 1921 | <Reference name="OpenSim.Framework.Console"/> |
1886 | <Reference name="OpenSim.Region.Physics.Manager"/> | 1922 | <Reference name="OpenSim.Framework.Monitoring"/> |
1887 | <Reference name="OpenSim.Framework.Servers"/> | 1923 | <Reference name="OpenSim.Framework.Servers"/> |
1888 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 1924 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
1889 | <Reference name="OpenSim.Framework.Statistics"/> | ||
1890 | <Reference name="OpenSim.Region.Framework"/> | 1925 | <Reference name="OpenSim.Region.Framework"/> |
1891 | <Reference name="OpenSim.Region.CoreModules"/> | 1926 | <Reference name="OpenSim.Region.CoreModules"/> |
1892 | <Reference name="OpenSim.Region.ClientStack"/> | 1927 | <Reference name="OpenSim.Region.ClientStack"/> |
1893 | <Reference name="OpenSim.Framework.Communications"/> | 1928 | <Reference name="OpenSim.Region.Physics.Manager"/> |
1894 | <Reference name="OpenSim.Server.Base"/> | 1929 | <Reference name="OpenSim.Server.Base"/> |
1895 | <Reference name="OpenSim.Services.Base"/> | 1930 | <Reference name="OpenSim.Services.Base"/> |
1896 | <Reference name="OpenSim.Services.Interfaces"/> | 1931 | <Reference name="OpenSim.Services.Interfaces"/> |
@@ -2403,10 +2438,11 @@ | |||
2403 | <Reference name="OpenSim"/> | 2438 | <Reference name="OpenSim"/> |
2404 | <Reference name="OpenSim.Framework"/> | 2439 | <Reference name="OpenSim.Framework"/> |
2405 | <Reference name="OpenSim.Framework.Communications"/> | 2440 | <Reference name="OpenSim.Framework.Communications"/> |
2441 | <Reference name="OpenSim.Framework.Console"/> | ||
2442 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
2406 | <Reference name="OpenSim.Region.Framework"/> | 2443 | <Reference name="OpenSim.Region.Framework"/> |
2407 | <Reference name="OpenSim.Region.CoreModules"/> | 2444 | <Reference name="OpenSim.Region.CoreModules"/> |
2408 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2445 | <Reference name="OpenSim.Region.Physics.Manager"/> |
2409 | <Reference name="OpenSim.Framework.Console"/> | ||
2410 | <Reference name="OpenSim.Services.Interfaces"/> | 2446 | <Reference name="OpenSim.Services.Interfaces"/> |
2411 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> | 2447 | <Reference name="OpenSim.Region.ScriptEngine.Shared"/> |
2412 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> | 2448 | <Reference name="OpenSim.Region.ScriptEngine.Shared.Api.Runtime"/> |
@@ -2529,8 +2565,12 @@ | |||
2529 | </Files> | 2565 | </Files> |
2530 | </Project> | 2566 | </Project> |
2531 | 2567 | ||
2568 | <<<<<<< HEAD:prebuild.xml | ||
2532 | 2569 | ||
2533 | <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> | 2570 | <Project frameworkVersion="v4_0" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> |
2571 | ======= | ||
2572 | <Project frameworkVersion="v3_5" name="OpenSim.Region.UserStatistics" path="OpenSim/Region/UserStatistics" type="Library"> | ||
2573 | >>>>>>> master:prebuild.xml | ||
2534 | <Configuration name="Debug"> | 2574 | <Configuration name="Debug"> |
2535 | <Options> | 2575 | <Options> |
2536 | <OutputPath>../../../bin/</OutputPath> | 2576 | <OutputPath>../../../bin/</OutputPath> |
@@ -2558,9 +2598,9 @@ | |||
2558 | <Reference name="OpenSim.Region.Framework"/> | 2598 | <Reference name="OpenSim.Region.Framework"/> |
2559 | <Reference name="OpenSim.Region.CoreModules"/> | 2599 | <Reference name="OpenSim.Region.CoreModules"/> |
2560 | <Reference name="OpenSim.Framework.Console"/> | 2600 | <Reference name="OpenSim.Framework.Console"/> |
2601 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
2561 | <Reference name="OpenSim.Framework.Servers"/> | 2602 | <Reference name="OpenSim.Framework.Servers"/> |
2562 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 2603 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
2563 | <Reference name="OpenSim.Framework.Statistics"/> | ||
2564 | <Reference name="OpenSim.Region.Physics.Manager"/> | 2604 | <Reference name="OpenSim.Region.Physics.Manager"/> |
2565 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> | 2605 | <Reference name="Mono.Data.SqliteClient" path="../../../bin/"/> |
2566 | <Reference name="Mono.Addins"/> | 2606 | <Reference name="Mono.Addins"/> |
@@ -3044,9 +3084,9 @@ | |||
3044 | <Reference name="OpenSim.Framework.Serialization"/> | 3084 | <Reference name="OpenSim.Framework.Serialization"/> |
3045 | <Reference name="OpenSim.Framework.Communications"/> | 3085 | <Reference name="OpenSim.Framework.Communications"/> |
3046 | <Reference name="OpenSim.Framework.Console"/> | 3086 | <Reference name="OpenSim.Framework.Console"/> |
3087 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3047 | <Reference name="OpenSim.Framework.Servers"/> | 3088 | <Reference name="OpenSim.Framework.Servers"/> |
3048 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3089 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3049 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3050 | <Reference name="OpenSim.Region.Framework"/> | 3090 | <Reference name="OpenSim.Region.Framework"/> |
3051 | <Reference name="OpenSim.Region.CoreModules"/> | 3091 | <Reference name="OpenSim.Region.CoreModules"/> |
3052 | <Reference name="OpenSim.Region.Physics.Manager"/> | 3092 | <Reference name="OpenSim.Region.Physics.Manager"/> |
@@ -3116,9 +3156,9 @@ | |||
3116 | <Reference name="OpenSim.Framework.Serialization"/> | 3156 | <Reference name="OpenSim.Framework.Serialization"/> |
3117 | <Reference name="OpenSim.Framework.Communications"/> | 3157 | <Reference name="OpenSim.Framework.Communications"/> |
3118 | <Reference name="OpenSim.Framework.Console"/> | 3158 | <Reference name="OpenSim.Framework.Console"/> |
3159 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3119 | <Reference name="OpenSim.Framework.Servers"/> | 3160 | <Reference name="OpenSim.Framework.Servers"/> |
3120 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3161 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3121 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3122 | <Reference name="OpenSim.Region.Framework"/> | 3162 | <Reference name="OpenSim.Region.Framework"/> |
3123 | <Reference name="OpenSim.Region.CoreModules"/> | 3163 | <Reference name="OpenSim.Region.CoreModules"/> |
3124 | <Reference name="OpenSim.Region.OptionalModules"/> | 3164 | <Reference name="OpenSim.Region.OptionalModules"/> |
@@ -3175,8 +3215,8 @@ | |||
3175 | <Reference name="OpenSim.Framework"/> | 3215 | <Reference name="OpenSim.Framework"/> |
3176 | <Reference name="OpenSim.Framework.Communications"/> | 3216 | <Reference name="OpenSim.Framework.Communications"/> |
3177 | <Reference name="OpenSim.Framework.Console"/> | 3217 | <Reference name="OpenSim.Framework.Console"/> |
3218 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3178 | <Reference name="OpenSim.Framework.Servers"/> | 3219 | <Reference name="OpenSim.Framework.Servers"/> |
3179 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3180 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3220 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3181 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | 3221 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> |
3182 | <Reference name="OpenSim.Region.Framework"/> | 3222 | <Reference name="OpenSim.Region.Framework"/> |
@@ -3232,9 +3272,9 @@ | |||
3232 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> | 3272 | <Reference name="OpenMetaverseTypes" path="../../../../../bin/"/> |
3233 | <Reference name="OpenSim.Framework"/> | 3273 | <Reference name="OpenSim.Framework"/> |
3234 | <Reference name="OpenSim.Framework.Communications"/> | 3274 | <Reference name="OpenSim.Framework.Communications"/> |
3275 | <Reference name="OpenSim.Framework.Monitoring"/> | ||
3235 | <Reference name="OpenSim.Framework.Servers"/> | 3276 | <Reference name="OpenSim.Framework.Servers"/> |
3236 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> | 3277 | <Reference name="OpenSim.Framework.Servers.HttpServer"/> |
3237 | <Reference name="OpenSim.Framework.Statistics"/> | ||
3238 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> | 3278 | <Reference name="OpenSim.Region.ClientStack.LindenCaps"/> |
3239 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3279 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3240 | <Reference name="OpenSim.Region.CoreModules"/> | 3280 | <Reference name="OpenSim.Region.CoreModules"/> |
@@ -3269,7 +3309,7 @@ | |||
3269 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> | 3309 | <Reference name="OpenMetaverseTypes" path="../../../../../../bin/"/> |
3270 | <Reference name="OpenSim.Framework"/> | 3310 | <Reference name="OpenSim.Framework"/> |
3271 | <Reference name="OpenSim.Framework.Communications"/> | 3311 | <Reference name="OpenSim.Framework.Communications"/> |
3272 | <Reference name="OpenSim.Framework.Statistics"/> | 3312 | <Reference name="OpenSim.Framework.Monitoring"/> |
3273 | <Reference name="OpenSim.Region.ClientStack"/> | 3313 | <Reference name="OpenSim.Region.ClientStack"/> |
3274 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> | 3314 | <Reference name="OpenSim.Region.ClientStack.LindenUDP"/> |
3275 | <Reference name="OpenSim.Region.CoreModules"/> | 3315 | <Reference name="OpenSim.Region.CoreModules"/> |