| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 70 | -658/+1740 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | LSL/OSSL lacks Math.Min & Math.Max implementations. | SignpostMarv | 2012-07-28 | 3 | -0/+54 |
| | | | |||||
| | * | Avoid a race condition between the scene shutdown thread and the update ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag. | ||||
| | * | making first run more resilient to bad input (loop until good input, rather ↵ | SignpostMarv | 2012-07-27 | 1 | -7/+19 |
| | | | | | | | | | than crash) | ||||
| | * | adding asset cache and map tile directories to .gitignore | SignpostMarv | 2012-07-27 | 1 | -0/+2 |
| | | | |||||
| | * | Remove the LandGeom checks in OdeScene - these are pointless since LandGeom ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | is always IntPtr.Zero and contacts returned always have a valid geometry. Possibly this was for a feature that was never implemented or was otherwise removed. Thanks to SignpostMarv for the spot of the warning that shows this parameter was never changed. | ||||
| | * | Update OpenMetaverse libraries at commit 6212cbd, this time built on Windows | justincc | 2012-07-27 | 5 | -0/+0 |
| | | | | | | | | | This is to try and resolve a strange Initialization exception for the AppearanceManager type that only occurs on Windows 64 bit (not Windows 32 bit or Linux!) | ||||
| | * | minor: Comment out unused MemoryWatchdog.m_churnRatePerMillisecond - this is ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -1/+1 |
| | | | | | | | | | currently calculated dynamically | ||||
| | * | Remove duplicated IScenePresence.PresenceType. This is already in ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required. | ||||
| | * | Replace libopenmetaverse commit 6212cbd with the same libraries but this ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 4 | -0/+0 |
| | | | | | | | | | | | | | time built with xbuild rather than nant. This may fix Windows and some mono version builds. | ||||
| | * | Remove a couple of compiler warnings pointed out by SignpostMarv | Justin Clark-Casey (justincc) | 2012-07-27 | 2 | -3/+0 |
| | | | |||||
| | * | Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012) | Justin Clark-Casey (justincc) | 2012-07-27 | 4 | -0/+0 |
| | | | | | | | | | | | | | | | | | Built from https://github.com/openmetaversefoundation/libopenmetaverse/commits/master This update incorporates a fix by Melanie in libomv where textures would sometimes rotate slightly when other properties were changed. Hence addresses http://opensimulator.org/mantis/view.php?id=6100 This update also incorporates libomv bot code updates that significantly reduce the warning spam for pCampbot. The change rate of libomv is low and many changes refer to bot or code not used by OpenSimulator, so I think it is sufficiently stable to use evne though it's not a release. | ||||
| | * | Add autoclean for scripted use | BlueWall | 2012-07-26 | 1 | -0/+13 |
| | | | | | | | | | ./runprebuild.sh autoclean - cleans projects w/o prompting | ||||
| | * | Add target switches | BlueWall | 2012-07-26 | 1 | -0/+11 |
| | | | | | | | | | ./runprebuild.sh vs2008/vs2010 to set the target | ||||
| | * | add clean task to reuprebuild.sh | BlueWall | 2012-07-26 | 1 | -2/+16 |
| | | | | | | | | | ./runprebuild.sh clean to clean up the project files | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-27 | 7 | -237/+429 |
| | |\ | |||||
| | | * | BulletSim: fix a recursive loop when fetching the mass of the root of a linkset. | Robert Adams | 2012-07-26 | 2 | -4/+4 |
| | | | | |||||
| | | * | BulletSim: refactor all the linkset logic out of the prim class | Robert Adams | 2012-07-26 | 5 | -237/+411 |
| | | | | | | | | | | | | | | | | | | | and into its own class. The BulletSim data structures track individual prims as linksets of 1 so most of the prim code is not different between a linked and unlinked object. | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2012-07-26 | 2 | -25/+49 |
| | | |\ | |||||
| | | * | | Add check so Ode does not try to simulate after it has been Dispose()'ed. ↵ | Robert Adams | 2012-07-26 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | | Fixes exception that happens when shutting down region (improvements from last patch) | ||||
| | | * | | Add a Dispose() of the physics engine when a scene is being shutdown. | Robert Adams | 2012-07-26 | 1 | -0/+9 |
| | | | | | |||||
| | * | | | Fix issue where RegionCombinerModule was not removing regions from its ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -0/+2 |
| | | |/ | |/| | | | | | | | dictionary on RemoveRegion(), causing a later issue if regions were restarted (removed then readded). | ||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-26 | 10 | -276/+784 |
| | |\ \ | | |/ | |||||
| | | * | BulletSim: update BulletSim DLLs and SOs | Robert Adams | 2012-07-25 | 4 | -0/+0 |
| | | | | |||||
| | | * | BulletSim: remove unused, commented out code in BSConstraint | Robert Adams | 2012-07-25 | 1 | -8/+0 |
| | | | | |||||
| | | * | BulletSim: fix line endings in newly added files (Is it DOS or is it UNIX? ↵ | Robert Adams | 2012-07-25 | 2 | -301/+301 |
| | | | | | | | | | | | | | Only it's hairdresser knows for sure) | ||||
| | | * | BulletSim: add parameters for setting linkset constraint factors | Robert Adams | 2012-07-25 | 3 | -17/+38 |
| | | | | |||||
| | | * | BulletSim: small change to use the pointer to the bullet object for zeroing ↵ | Robert Adams | 2012-07-25 | 1 | -6/+5 |
| | | | | | | | | | | | | | forces. | ||||
| | | * | BulletSim: Redo parameter specification so only one place has | Robert Adams | 2012-07-25 | 1 | -248/+378 |
| | | | | | | | | | | | | | | | | to change to have a parameter show up in the ini file and command line. Will make it much easier for the next person. | ||||
| | | * | BulletSim: Add C# classes for storing and tracking constraints. | Robert Adams | 2012-07-25 | 2 | -0/+301 |
| | | | | |||||
| | | * | BulletSim: Move constraint tracking from C++ code to C# code | Robert Adams | 2012-07-25 | 2 | -18/+83 |
| | | | | | | | | | | | | | for more flexibility. | ||||
| | * | | When copying items, copy the item description field instead of the asset ↵ | Justin Clark-Casey (justincc) | 2012-07-26 | 2 | -25/+49 |
| | |/ | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc. | ||||
| | * | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 14 | -28/+42 |
| | | | | | | | | | with other monitoring code from OpenSim.Framework | ||||
| | * | Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring. | Justin Clark-Casey (justincc) | 2012-07-25 | 27 | -53/+50 |
| | | | | | | | | | This better reflects the long-term purpose of that project and matches Monitoring modules. | ||||
| | * | Add MemoryWatchdog class missing from git master a1e9964 | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -0/+129 |
| | | | |||||
| | * | Correct churn stat from MB/s from KB/s | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -1/+1 |
| | | | |||||
| | * | Add experimental "OpenSim object memory churn" statistics to output of ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 6 | -63/+73 |
| | | | | | | | | | | | | | | | | | 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. | ||||
| | * | Make SceneManager.OnRegionsReadyStatusChange event available. | Justin Clark-Casey (justincc) | 2012-07-25 | 8 | -18/+87 |
| | | | | | | | | | | | This is fired when all regions are ready or when at least one region becomes not ready. Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-07-25 | 11 | -138/+370 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | ||||
| | * | Rename "image queues clear" console command to "clear image queues" | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -12/+6 |
| | | | | | | | | | | | There is less justification for this word arrangement (verb after noun) now that command help is categorized. Also removes "image queues show" in favour of existing alias "show image queues". | ||||
| | * | Add information about each column to "show queues" region console command help. | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -2/+9 |
| | | | |||||
| | * | Extend region console "show queues" command to show already collected time ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 2 | -19/+26 |
| | | | | | | | | | since last packeted received by the simulator from a viewer. | ||||
| | * | Remove bad using statement in AttachmentsModuleTests. | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -2/+1 |
| | | | | | | | | | It seems that the mono 2.10.8.1 doesn't choke on this but for some reason 2.4.3 fails. | ||||
| | * | extend regression TestRezScriptedAttachmentFromInventory() to check actual ↵ | Justin Clark-Casey (justincc) | 2012-07-24 | 1 | -3/+19 |
| | | | | | | | | | start of script rather than just the script status reported by SOG.ContainsScripts() | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-07-24 | 7 | -96/+265 |
| | |\ | |||||
| | | * | BulletSim: update BulletSim.dlls and so's | Robert Adams | 2012-07-23 | 4 | -0/+0 |
| | | | | |||||
| | | * | BulletSim: change how prim mass is saved so it is always calculated but zero ↵ | Robert Adams | 2012-07-23 | 1 | -20/+23 |
| | | | | | | | | | | | | | is given if not physical. | ||||
| | | * | BulletSim: small optimizations for link and unlink code | Robert Adams | 2012-07-23 | 1 | -12/+8 |
| | | | | |||||
| | | * | BulletSim: add Dispose() code to free up resources and close log files. | Robert Adams | 2012-07-23 | 1 | -0/+21 |
| | | | | |||||
| | | * | BulletSim: add all the new functions to BulletSimAPI. | Robert Adams | 2012-07-23 | 2 | -6/+139 |
| | | | | | | | | | | | | | Modify ZeroMotion() to not make tainting calls and to use new API calls. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |