aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs1
-rw-r--r--prebuild.xml209
2 files changed, 106 insertions, 104 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
index 36c84c7..b4811da 100644
--- a/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/UserManagement/UserManagementModule.cs
@@ -31,6 +31,7 @@ using System.Reflection;
31 31
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Console; 33using OpenSim.Framework.Console;
34using OpenSim.Region.ClientStack.LindenUDP;
34using OpenSim.Region.Framework; 35using OpenSim.Region.Framework;
35using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
diff --git a/prebuild.xml b/prebuild.xml
index d3af892..b8d37c5 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1376,110 +1376,6 @@
1376 </Files> 1376 </Files>
1377 </Project> 1377 </Project>
1378 1378
1379 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1380 <Configuration name="Debug">
1381 <Options>
1382 <OutputPath>../../../bin/</OutputPath>
1383 <AllowUnsafe>true</AllowUnsafe>
1384 </Options>
1385 </Configuration>
1386 <Configuration name="Release">
1387 <Options>
1388 <OutputPath>../../../bin/</OutputPath>
1389 <AllowUnsafe>true</AllowUnsafe>
1390 </Options>
1391 </Configuration>
1392
1393 <ReferencePath>../../../bin/</ReferencePath>
1394 <Reference name="System"/>
1395 <Reference name="System.Core"/>
1396 <Reference name="System.Xml"/>
1397 <Reference name="System.Xml.Linq"/>
1398 <Reference name="System.Drawing"/>
1399 <Reference name="System.Web"/>
1400 <Reference name="NDesk.Options" path="../../../bin/"/>
1401 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1402 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1403 <Reference name="OpenMetaverse" path="../../../bin/"/>
1404 <Reference name="CSJ2K" path="../../../bin/"/>
1405 <Reference name="Warp3D" path="../../../bin/"/>
1406 <Reference name="OpenSim.Capabilities"/>
1407 <Reference name="OpenSim.Data"/>
1408 <Reference name="OpenSim.Framework"/>
1409 <Reference name="OpenSim.Framework.Communications"/>
1410 <Reference name="OpenSim.Framework.Console"/>
1411 <Reference name="OpenSim.Framework.Monitoring"/>
1412 <Reference name="OpenSim.Framework.Serialization"/>
1413 <Reference name="OpenSim.Framework.Servers"/>
1414 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1415 <Reference name="OpenSim.Region.Framework"/>
1416 <Reference name="OpenSim.Region.Physics.Manager"/>
1417 <Reference name="OpenSim.Server.Base"/>
1418 <Reference name="OpenSim.Server.Handlers"/>
1419 <Reference name="OpenSim.Services.Connectors"/>
1420 <Reference name="OpenSim.Services.Base"/>
1421 <Reference name="OpenSim.Services.Interfaces"/>
1422 <Reference name="Ionic.Zip" path="../../../bin/"/>
1423
1424 <Reference name="GlynnTucker.Cache" path="../../../bin/"/>
1425
1426 <!-- For scripting in funny languages by default -->
1427 <Reference name="XMLRPC" path="../../../bin/"/>
1428 <Reference name="OpenSim.Framework.Communications"/>
1429 <Reference name="Nini" path="../../../bin/"/>
1430 <Reference name="log4net" path="../../../bin/"/>
1431 <Reference name="DotNetOpenMail" path="../../../bin/"/>
1432
1433 <!-- To allow regions to have mono addins -->
1434 <Reference name="Mono.Addins" path="../../../bin/"/>
1435
1436 <Files>
1437 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1438 <Match pattern="*.cs" recurse="true">
1439 <Exclude name="Tests" pattern="Tests"/>
1440 </Match>
1441 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1442 </Files>
1443 </Project>
1444
1445 <Project frameworkVersion="v3_5" name="OpenSim.Region.RegionCombinerModule" path="OpenSim/Region/RegionCombinerModule" type="Library">
1446 <Configuration name="Debug">
1447 <Options>
1448 <OutputPath>../../../bin/</OutputPath>
1449 </Options>
1450 </Configuration>
1451 <Configuration name="Release">
1452 <Options>
1453 <OutputPath>../../../bin/</OutputPath>
1454 </Options>
1455 </Configuration>
1456
1457 <ReferencePath>../../../bin/</ReferencePath>
1458 <Reference name="System"/>
1459 <Reference name="System.Xml"/>
1460 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1461 <Reference name="OpenMetaverse" path="../../../bin/"/>
1462 <Reference name="OpenSim.Framework"/>
1463 <Reference name="OpenSim.Framework.Communications"/>
1464 <Reference name="OpenSim.Region.Framework"/>
1465 <Reference name="OpenSim.Server.Base"/>
1466 <Reference name="OpenSim.Server.Handlers"/>
1467 <Reference name="OpenSim.Framework.Console"/>
1468 <Reference name="OpenSim.Region.Physics.Manager"/>
1469 <Reference name="OpenSim.Framework.Communications"/>
1470 <Reference name="OpenSim.Region.CoreModules"/>
1471 <Reference name="Nini" path="../../../bin/"/>
1472 <Reference name="log4net" path="../../../bin/"/>
1473
1474 <!-- To allow regions to have mono addins -->
1475 <Reference name="Mono.Addins" path="../../../bin/"/>
1476
1477 <Files>
1478 <Match pattern="*.cs" recurse="true"/>
1479 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
1480 </Files>
1481 </Project>
1482
1483 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library"> 1379 <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack" path="OpenSim/Region/ClientStack" type="Library">
1484 <Configuration name="Debug"> 1380 <Configuration name="Debug">
1485 <Options> 1381 <Options>
@@ -1600,6 +1496,111 @@
1600 </Files> 1496 </Files>
1601 </Project> 1497 </Project>
1602 1498
1499 <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1500 <Configuration name="Debug">
1501 <Options>
1502 <OutputPath>../../../bin/</OutputPath>
1503 <AllowUnsafe>true</AllowUnsafe>
1504 </Options>
1505 </Configuration>
1506 <Configuration name="Release">
1507 <Options>
1508 <OutputPath>../../../bin/</OutputPath>
1509 <AllowUnsafe>true</AllowUnsafe>
1510 </Options>
1511 </Configuration>
1512
1513 <ReferencePath>../../../bin/</ReferencePath>
1514 <Reference name="System"/>
1515 <Reference name="System.Core"/>
1516 <Reference name="System.Xml"/>
1517 <Reference name="System.Xml.Linq"/>
1518 <Reference name="System.Drawing"/>
1519 <Reference name="System.Web"/>
1520 <Reference name="NDesk.Options" path="../../../bin/"/>
1521 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
1522 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
1523 <Reference name="OpenMetaverse" path="../../../bin/"/>
1524 <Reference name="CSJ2K" path="../../../bin/"/>
1525 <Reference name="Warp3D" path="../../../bin/"/>
1526 <Reference name="OpenSim.Capabilities"/>
1527 <Reference name="OpenSim.Data"/>
1528 <Reference name="OpenSim.Framework"/>
1529 <Reference name="OpenSim.Framework.Communications"/>
1530 <Reference name="OpenSim.Framework.Console"/>
1531 <Reference name="OpenSim.Framework.Monitoring"/>
1532 <Reference name="OpenSim.Framework.Serialization"/>
1533 <Reference name="OpenSim.Framework.Servers"/>
1534 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
1535 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
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
1603 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library"> 1604 <Project frameworkVersion="v3_5" name="OpenSim.Region.OptionalModules" path="OpenSim/Region/OptionalModules" type="Library">
1604 <Configuration name="Debug"> 1605 <Configuration name="Debug">
1605 <Options> 1606 <Options>