aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml
diff options
context:
space:
mode:
authorMelanie2012-10-07 02:48:28 +0100
committerMelanie2012-10-07 02:48:28 +0100
commitf7df68d922758c0a78664abe82d631579f6aa63f (patch)
tree85daa41ff4b35653b4fbb987cbc852ad853decef /prebuild.xml
parentMerge branch 'master' into careminster (diff)
parentrefactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is... (diff)
downloadopensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.zip
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.gz
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.bz2
opensim-SC_OLD-f7df68d922758c0a78664abe82d631579f6aa63f.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
Diffstat (limited to 'prebuild.xml')
-rw-r--r--prebuild.xml209
1 files changed, 105 insertions, 104 deletions
diff --git a/prebuild.xml b/prebuild.xml
index d149010..eae85bb 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1497,110 +1497,6 @@
1497 </Files> 1497 </Files>
1498 </Project> 1498 </Project>
1499 1499
1500 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1501 <Configuration name="Debug">
1502 <Options>
1503 <OutputPath>../../../bin/</OutputPath>
1504 <AllowUnsafe>true</AllowUnsafe>
1505 </Options>
1506 </Configuration>
1507 <Configuration name="Release">
1508 <Options>
1509 <OutputPath>../../../bin/</OutputPath>
1510 <AllowUnsafe>true</AllowUnsafe>
1511 </Options>
1512 </Configuration>
1513
1514 <ReferencePath>../../../bin/</ReferencePath>
1515 <Reference name="System"/>
1516 <Reference name="System.Core"/>
1517 <Reference name="System.Xml"/>
1518 <Reference name="System.Xml.Linq"/>
1519 <Reference name="System.Drawing"/>
1520 <Reference name="System.Web"/>
1521 <Reference name="NDesk.Options" path="../../../bin/"/>
1522 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1523 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1524 <Reference name="OpenMetaverse" path="../../../bin/"/>
1525 <Reference name="CSJ2K" path="../../../bin/"/>
1526 <Reference name="Warp3D" path="../../../bin/"/>
1527 <Reference name="OpenSim.Capabilities"/>
1528 <Reference name="OpenSim.Data"/>
1529 <Reference name="OpenSim.Framework"/>
1530 <Reference name="OpenSim.Framework.Communications"/>
1531 <Reference name="OpenSim.Framework.Console"/>
1532 <Reference name="OpenSim.Framework.Monitoring"/>
1533 <Reference name="OpenSim.Framework.Serialization"/>
1534 <Reference name="OpenSim.Framework.Servers"/>
1535 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1536 <Reference name="OpenSim.Region.Framework"/>
1537 <Reference name="OpenSim.Region.Physics.Manager"/>
1538 <Reference name="OpenSim.Server.Base"/>
1539 <Reference name="OpenSim.Server.Handlers"/>
1540 <Reference name="OpenSim.Services.Connectors"/>
1541 <Reference name="OpenSim.Services.Base"/>
1542 <Reference name="OpenSim.Services.Interfaces"/>
1543 <Reference name="Ionic.Zip" path="../../../bin/"/>
1544
1545 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1546
1547 <!-- For scripting in funny languages by default -->
1548 <Reference name="XMLRPC" path="../../../bin/"/>
1549 <Reference name="OpenSim.Framework.Communications"/>
1550 <Reference name="Nini" path="../../../bin/"/>
1551 <Reference name="log4net" path="../../../bin/"/>
1552 <Reference name="DotNetOpenMail" path="../../../bin/"/>
1553
1554 <!-- To allow regions to have mono addins -->
1555 <Reference name="Mono.Addins" path="../../../bin/"/>
1556
1557 <Files>
1558 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1559 <Match pattern="*.cs" recurse="true">
1560 <Exclude name="Tests" pattern="Tests"/>
1561 </Match>
1562 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1563 </Files>
1564 </Project>
1565
1566 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1567 <Configuration name="Debug">
1568 <Options>
1569 <OutputPath>../../../bin/</OutputPath>
1570 </Options>
1571 </Configuration>
1572 <Configuration name="Release">
1573 <Options>
1574 <OutputPath>../../../bin/</OutputPath>
1575 </Options>
1576 </Configuration>
1577
1578 <ReferencePath>../../../bin/</ReferencePath>
1579 <Reference name="System"/>
1580 <Reference name="System.Xml"/>
1581 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1582 <Reference name="OpenMetaverse" path="../../../bin/"/>
1583 <Reference name="OpenSim.Framework"/>
1584 <Reference name="OpenSim.Framework.Communications"/>
1585 <Reference name="OpenSim.Region.Framework"/>
1586 <Reference name="OpenSim.Server.Base"/>
1587 <Reference name="OpenSim.Server.Handlers"/>
1588 <Reference name="OpenSim.Framework.Console"/>
1589 <Reference name="OpenSim.Region.Physics.Manager"/>
1590 <Reference name="OpenSim.Framework.Communications"/>
1591 <Reference name="OpenSim.Region.CoreModules"/>
1592 <Reference name="Nini" path="../../../bin/"/>
1593 <Reference name="log4net" path="../../../bin/"/>
1594
1595 <!-- To allow regions to have mono addins -->
1596 <Reference name="Mono.Addins" path="../../../bin/"/>
1597
1598 <Files>
1599 <Match pattern="*.cs" recurse="true"/>
1600 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1601 </Files>
1602 </Project>
1603
1604 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1500 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1605 <Configuration name="Debug"> 1501 <Configuration name="Debug">
1606 <Options> 1502 <Options>
@@ -1723,6 +1619,111 @@
1723 </Files> 1619 </Files>
1724 </Project> 1620 </Project>
1725 1621
1622 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1623 <Configuration name="Debug">
1624 <Options>
1625 <OutputPath>../../../bin/</OutputPath>
1626 <AllowUnsafe>true</AllowUnsafe>
1627 </Options>
1628 </Configuration>
1629 <Configuration name="Release">
1630 <Options>
1631 <OutputPath>../../../bin/</OutputPath>
1632 <AllowUnsafe>true</AllowUnsafe>
1633 </Options>
1634 </Configuration>
1635
1636 <ReferencePath>../../../bin/</ReferencePath>
1637 <Reference name="System"/>
1638 <Reference name="System.Core"/>
1639 <Reference name="System.Xml"/>
1640 <Reference name="System.Xml.Linq"/>
1641 <Reference name="System.Drawing"/>
1642 <Reference name="System.Web"/>
1643 <Reference name="NDesk.Options" path="../../../bin/"/>
1644 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1645 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1646 <Reference name="OpenMetaverse" path="../../../bin/"/>
1647 <Reference name="CSJ2K" path="../../../bin/"/>
1648 <Reference name="Warp3D" path="../../../bin/"/>
1649 <Reference name="OpenSim.Capabilities"/>
1650 <Reference name="OpenSim.Data"/>
1651 <Reference name="OpenSim.Framework"/>
1652 <Reference name="OpenSim.Framework.Communications"/>
1653 <Reference name="OpenSim.Framework.Console"/>
1654 <Reference name="OpenSim.Framework.Monitoring"/>
1655 <Reference name="OpenSim.Framework.Serialization"/>
1656 <Reference name="OpenSim.Framework.Servers"/>
1657 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1658 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
1659 <Reference name="OpenSim.Region.Framework"/>
1660 <Reference name="OpenSim.Region.Physics.Manager"/>
1661 <Reference name="OpenSim.Server.Base"/>
1662 <Reference name="OpenSim.Server.Handlers"/>
1663 <Reference name="OpenSim.Services.Connectors"/>
1664 <Reference name="OpenSim.Services.Base"/>
1665 <Reference name="OpenSim.Services.Interfaces"/>
1666 <Reference name="Ionic.Zip" path="../../../bin/"/>
1667
1668 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1669
1670 <!-- For scripting in funny languages by default -->
1671 <Reference name="XMLRPC" path="../../../bin/"/>
1672 <Reference name="OpenSim.Framework.Communications"/>
1673 <Reference name="Nini" path="../../../bin/"/>
1674 <Reference name="log4net" path="../../../bin/"/>
1675 <Reference name="DotNetOpenMail" path="../../../bin/"/>
1676
1677 <!-- To allow regions to have mono addins -->
1678 <Reference name="Mono.Addins" path="../../../bin/"/>
1679
1680 <Files>
1681 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1682 <Match pattern="*.cs" recurse="true">
1683 <Exclude name="Tests" pattern="Tests"/>
1684 </Match>
1685 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1686 </Files>
1687 </Project>
1688
1689 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1690 <Configuration name="Debug">
1691 <Options>
1692 <OutputPath>../../../bin/</OutputPath>
1693 </Options>
1694 </Configuration>
1695 <Configuration name="Release">
1696 <Options>
1697 <OutputPath>../../../bin/</OutputPath>
1698 </Options>
1699 </Configuration>
1700
1701 <ReferencePath>../../../bin/</ReferencePath>
1702 <Reference name="System"/>
1703 <Reference name="System.Xml"/>
1704 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1705 <Reference name="OpenMetaverse" path="../../../bin/"/>
1706 <Reference name="OpenSim.Framework"/>
1707 <Reference name="OpenSim.Framework.Communications"/>
1708 <Reference name="OpenSim.Region.Framework"/>
1709 <Reference name="OpenSim.Server.Base"/>
1710 <Reference name="OpenSim.Server.Handlers"/>
1711 <Reference name="OpenSim.Framework.Console"/>
1712 <Reference name="OpenSim.Region.Physics.Manager"/>
1713 <Reference name="OpenSim.Framework.Communications"/>
1714 <Reference name="OpenSim.Region.CoreModules"/>
1715 <Reference name="Nini" path="../../../bin/"/>
1716 <Reference name="log4net" path="../../../bin/"/>
1717
1718 <!-- To allow regions to have mono addins -->
1719 <Reference name="Mono.Addins" path="../../../bin/"/>
1720
1721 <Files>
1722 <Match pattern="*.cs" recurse="true"/>
1723 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1724 </Files>
1725 </Project>
1726
1726 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> 1727 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1727 <Configuration name="Debug"> 1728 <Configuration name="Debug">
1728 <Options> 1729 <Options>
generated by cgit v1.1 at 2024-10-12 03:09:03 +0000