aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/prebuild.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-231-0/+1
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/IClientAPI.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add --force flag to "kick user" console command to allow bypassing of recent ↵Justin Clark-Casey (justincc)2012-08-201-0/+1
| | | | | | | | | | | | | | | | | | race condition checks. This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once). You should only attempt --force if a normal kick fails. This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive. This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
* | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5UbitUmarov2012-08-061-97/+97
| |
* | Merge branch 'master' into careminsterMelanie2012-08-031-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-021-1/+1
| |
* | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-39/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-07-281-23/+63
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | 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
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-26/+29
| | | | | | | | with other monitoring code from OpenSim.Framework
| * Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.Justin Clark-Casey (justincc)2012-07-251-24/+23
| | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules.
| * Add experimental "OpenSim object memory churn" statistics to output of ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | | | | | | | | | region console "show stats" command This aims to capture the amount of memory that OpenSim turns over whilst operating a region. This memory is not lost - apart from leaks it is reclaimed by the garbage collector. However, the more memory that gets turned over the more work the GC has to do to reclaim it.
* | Fix merge issues in prebuildMelanie2012-07-231-33/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-07-231-0/+25
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml
| * Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled ↵Robert Adams2012-07-201-58/+58
| | | | | | | | before BulletSim is
| * Remove an added but unnecessary dependency in prebuild.xmlRobert Adams2012-07-201-1/+0
| |
| * Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵Robert Adams2012-07-201-0/+1
| | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance).
* | Merge branch 'master' into careminsterMelanie2012-07-121-0/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
| * Fix build break for windows with missing package for IScriptEngine in ↵Justin Clark-Casey (justincc)2012-07-111-0/+1
| | | | | | | | prebuild.xml for OpenSim.Region.CoreModules.Tests.dll
| * Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-111-0/+1
| | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml
* | Merge branch 'master' into careminsterMelanie2012-07-111-0/+1
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵Justin Clark-Casey (justincc)2012-07-101-0/+1
| | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information
* | Merge branch 'master' into careminsterMelanie2012-06-151-0/+1
|\ \ | |/
| * Make the "debug http" command available for robust as well as the simulator. ↵Justin Clark-Casey (justincc)2012-06-151-0/+1
| | | | | | | | | | | | This allows one to see incoming requests as they happen. This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
* | Merge branch 'master' into careminsterMelanie2012-06-071-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Mantis 6044 Building master currently fails.Talun2012-06-071-0/+1
| | | | | | | | | | | | Add missing reference to System.Core Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-04-271-0/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * Fix prebuild.xmlBlueWall2012-04-271-1/+1
| | | | | | | | adding a reference to a dll requires 'path="..."'
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-0/+1
| | | | | | | | DotNetZip provides much better compression than standard .NET.
* | Fx up estate settingsMelanie2012-04-181-96/+96
| |
* | Merge branch 'master' into careminsterMelanie2012-04-031-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Eliminate race condition where many callers would check SOP.PhysicsActor != ↵Justin Clark-Casey (justincc)2012-04-031-1/+1
| | | | | | | | | | | | | | | | null then assume it was still not null in later code. Another thread could come and turn off physics for a part (null PhysicsActor) at any point. Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs No obvious reason for doing that copy - nothing else does it.
* | Merge branch 'master' into careminsterMelanie2012-03-311-0/+3
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Tests/Common/Mock/TestClient.cs
| * Added missing dependency for MS 2008. I hope. (I don't have 2008 to test ↵Diva Canto2012-03-301-0/+1
| | | | | | | | this) mantis #5949
| * Make default "show friends" console command show friends fetched from the ↵Justin Clark-Casey (justincc)2012-03-301-0/+1
| | | | | | | | | | | | friends service. There is no a --cache option which will show friends from the local cache if available.
| * Add simple login test with online friends. Add IFriendsModule.GrantRights() ↵Justin Clark-Casey (justincc)2012-03-301-0/+1
| | | | | | | | | | | | | | for granting rights via a module call. Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology. Add some method doc.
* | Update prebuildMelanie2012-03-201-24/+27
| |
* | added a new UbitMeshing module so i can mess it...UbitUmarov2012-03-171-0/+31
| |
* | Merge branch 'master' into careminsterMelanie2012-03-091-1/+2
|\ \ | |/
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-1/+2
| |\
| | * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-061-1/+2
| | | | | | | | | | | | | | | | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
* | | Merge branch 'master' into careminsterMelanie2012-03-081-0/+1
|\ \ \ | |/ /
| * | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' into careminsterMelanie2012-02-211-25/+0
|\ \ | |/ | | | | Conflicts:
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-211-25/+0
| | | | | | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
| * Fix another Torture test build break on Windows.Justin Clark-Casey (justincc)2012-02-091-0/+1
| |
| * Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.Justin Clark-Casey (justincc)2012-02-091-0/+3
| |
| * Add missing reference to prebuild.xml for torture testsRobert Adams2012-02-071-0/+1
| |
* | Fix merge issues in prebuildMelanie2012-02-191-1/+5
| |
* | revert project name to OpenSim and not CareminsterUbitUmarov2012-02-111-1/+1
| |
* | changes needed to compile UbitODE, also changes project name to ↵UbitUmarov2012-02-081-2/+33
| | | | | | | | "Careminter". untested on linux
* | Merge branch 'master' into careminsterMelanie2012-02-071-0/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
generated by cgit v1.1 at 2024-10-11 14:36:14 +0000