| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -1/+0 |
| |\ | |||||
| | * | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 1 | -1/+0 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | touch prebuild.xml | UbitUmarov | 2012-09-24 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-24 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Change the poll service to use a thread pool for replies to make sure the | Melanie | 2012-09-23 | 1 | -0/+1 |
| | | | | | | | | | event queues aren't blocked by other traffic. | ||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | fix build | UbitUmarov | 2012-09-17 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-17 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | add suport funtions for mesh upload costs | UbitUmarov | 2012-09-17 | 1 | -0/+1 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | fix prebuild.xml | UbitUmarov | 2012-09-11 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | ubit | 2012-09-11 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Revamp the v3 inventory sending. Uses threads and some nifty mechanics to | Melanie | 2012-09-11 | 1 | -0/+1 |
| | | | | | | | | | leverage the Poll Service without blocking it's workers. | ||||
| * | | dummy commit | ubit | 2012-09-11 | 1 | -1/+2 |
| | | | |||||
| * | | try fixing building.. | ubit | 2012-08-16 | 1 | -0/+2 |
| |/ | |||||
| * | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 | UbitUmarov | 2012-08-06 | 1 | -97/+97 |
| | | |||||
| * | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 1 | -1/+1 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Add simple draw test for the VectorRenderModule | Justin Clark-Casey (justincc) | 2012-08-02 | 1 | -1/+1 |
| | | | |||||
| * | | Fix some merge issues and a functional issue in the scene manager | Melanie | 2012-07-28 | 1 | -39/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 1 | -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-25 | 1 | -26/+29 |
| | | | | | | | | | with other monitoring code from OpenSim.Framework | ||||
| | * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -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-25 | 1 | -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 prebuild | Melanie | 2012-07-23 | 1 | -33/+33 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-23 | 1 | -0/+25 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Helpers.cs prebuild.xml | ||||
| | * | Reorder BulletSim in prebuild.xml so OpenSim.Region.CoreModules is compiled ↵ | Robert Adams | 2012-07-20 | 1 | -58/+58 |
| | | | | | | | | | before BulletSim is | ||||
| | * | Remove an added but unnecessary dependency in prebuild.xml | Robert Adams | 2012-07-20 | 1 | -1/+0 |
| | | | |||||
| | * | Correct namespace of BinaryLoggingModule (a cut-and-paste error). Add a ↵ | Robert Adams | 2012-07-20 | 1 | -0/+1 |
| | | | | | | | | | simple, high performance logger for high frequency logging (physics sub-operations, for instance). | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 1 | -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-11 | 1 | -0/+1 |
| | | | | | | | | | prebuild.xml for OpenSim.Region.CoreModules.Tests.dll | ||||
| | * | Add regression TestDetachScriptedAttachmentToInventory() | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -0/+1 |
| | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 1 | -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-10 | 1 | -0/+1 |
| | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-06-15 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Make the "debug http" command available for robust as well as the simulator. ↵ | Justin Clark-Casey (justincc) | 2012-06-15 | 1 | -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 careminster | Melanie | 2012-06-07 | 1 | -0/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Mantis 6044 Building master currently fails. | Talun | 2012-06-07 | 1 | -0/+1 |
| | | | | | | | | | | | | | Add missing reference to System.Core Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -0/+1 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | ||||
| | * | Fix prebuild.xml | BlueWall | 2012-04-27 | 1 | -1/+1 |
| | | | | | | | | | adding a reference to a dll requires 'path="..."' | ||||
| | * | Use DotNetZip to compress OARs and IARs. | Oren Hurvitz | 2012-04-27 | 1 | -0/+1 |
| | | | | | | | | | DotNetZip provides much better compression than standard .NET. | ||||
| * | | Fx up estate settings | Melanie | 2012-04-18 | 1 | -96/+96 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-04-03 | 1 | -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-03 | 1 | -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 careminster | Melanie | 2012-03-31 | 1 | -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 Canto | 2012-03-30 | 1 | -0/+1 |
| | | | | | | | | | this) mantis #5949 | ||||
| | * | Make default "show friends" console command show friends fetched from the ↵ | Justin Clark-Casey (justincc) | 2012-03-30 | 1 | -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-30 | 1 | -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 prebuild | Melanie | 2012-03-20 | 1 | -24/+27 |
| | | | |||||
| * | | added a new UbitMeshing module so i can mess it... | UbitUmarov | 2012-03-17 | 1 | -0/+31 |
| | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |