| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 5 | -129/+311 | |
| |\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| | * | | | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵ | UbitUmarov | 2012-03-21 | 4 | -7/+21 | |
| | | | | | | | | | | | | | | | | | | | | | it also to original mesher code and zeromesher | |||||
| | * | | | | added convex decomposition hulls support. Hardcoded to use mesh or this. ↵ | UbitUmarov | 2012-03-20 | 1 | -18/+146 | |
| | | | | | | | | | | | | | | | | | | | | | (so no simple hull of convex prims for now). | |||||
| | * | | | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ↵ | UbitUmarov | 2012-03-20 | 2 | -124/+164 | |
| | | | | | | | | | | | | | | | | | | | | | is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer" | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 10 | -192/+205 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | | | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+0 | |
| | | | | | | ||||||
| | * | | | | remove unnecessary tmpFrameMS, use maintc instead for frame time calculation | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+2 | |
| | | | | | | ||||||
| | * | | | | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | | * | | | | slight increase in jump power to make running jump slightly better. | nebadon | 2012-03-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Move frame loop entirely within Scene.Update() for better future performance ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 6 | -176/+197 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | analysis and stat accuracy. Update() now accepts a frames parameter which can control the number of frames updated. -1 will update until shutdown. The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame. | |||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 3 | -12/+24 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | reduce avatar verticle jump from the absurd 5 meter jump to a less | nebadon | 2012-03-20 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | absurd 3m vertical jump to better match what you would see in Second Life and be more in line with what users would expect. | |||||
| | * | | | | refactor: precalculate the fixed movement factor for avatar tilting ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 2 | -8/+16 | |
| | | | | | | | | | | | | | | | | | | | | | (sqrt(2)) rather than doing it multiple times on every move. | |||||
| | * | | | | refactor: Eliminate unnecessary duplicate avCapsuleTilted | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -3/+7 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 3 | -6/+32 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | | | add some more notifications about changes on physical parameters ( still ↵ | UbitUmarov | 2012-03-20 | 3 | -10/+14 | |
| | | | | | | | | | | | | | | | | | | | | | incomple and there should be a better away ) | |||||
| * | | | | | Cover the case where prims are loaded and ParentGroup is not yet set | Melanie | 2012-03-20 | 1 | -5/+10 | |
| |/ / / / | ||||||
| * | | | | Cause prims to be saved if extra physics parameters are changed | Melanie | 2012-03-20 | 1 | -0/+5 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 6 | -39/+34 | |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs | |||||
| | * | | | Remove pointless ThreadAbortException catching in a test that isn't run anyway. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -11/+5 | |
| | | | | | ||||||
| | * | | | Remove some pointless catching/throwing in the scene loop. | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -7/+0 | |
| | | | | | ||||||
| | * | | | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵ | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -10/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | the same time. Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time. | |||||
| | * | | | Add some doc about the EventManager.OnLoginsEnabled event. | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -0/+7 | |
| | | | | | ||||||
| | * | | | Fix a bug where logins to standalones would fail if the RegionReady module ↵ | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -7/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not active Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active. However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded | |||||
| | * | | | Stop console command "xengine status" throwing an exception if there are no ↵ | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -4/+4 | |
| | |/ / | | | | | | | | | | | | | | | | scripts in a region. Addresses http://opensimulator.org/mantis/view.php?id=5940 | |||||
| * | | | Remove debug output using Console.WriteLine and trim excessive whitespace | Melanie | 2012-03-19 | 1 | -8/+0 | |
| | | | | ||||||
| * | | | Merge branch 'ubitwork' | Melanie | 2012-03-19 | 9 | -22/+4918 | |
| |\ \ \ | ||||||
| | * | | | added a new UbitMeshing module so i can mess it... | UbitUmarov | 2012-03-17 | 6 | -0/+4726 | |
| | | | | | ||||||
| | * | | | some more work on costs | UbitUmarov | 2012-03-16 | 3 | -22/+192 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 30 | -272/+970 | |
| |\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | Amend to previous commit: normalize strings ToLower. | Diva Canto | 2012-03-17 | 1 | -2/+6 | |
| | | | | ||||||
| | * | | More on HG access control. This commit splits the UserManagementModule into ↵ | Diva Canto | 2012-03-17 | 3 | -40/+182 | |
| | | | | | | | | | | | | | the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com. | |||||
| | * | | Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ↵ | Diva Canto | 2012-03-17 | 3 | -55/+62 | |
| | | | | | | | | | | | | | UserManagementModule where it belongs. No functional changes. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-17 | 3 | -0/+30 | |
| | |\ \ | ||||||
| | | * | | Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927 | Justin Clark-Casey (justincc) | 2012-03-17 | 3 | -0/+30 | |
| | | | | | | | | | | | | | | | | | | | | | This allows one to get description data for a given prim inventory item. Thanks MarcelEdward and GuduleLapointe! | |||||
| | * | | | Region access control! Region operators can now specify things like ↵ | Diva Canto | 2012-03-17 | 3 | -29/+142 | |
| | |/ / | | | | | | | | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector. | |||||
| | * | | Clean up "save iar" help | Justin Clark-Casey (justincc) | 2012-03-17 | 1 | -8/+8 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-16 | 1 | -1/+6 | |
| | |\ \ | ||||||
| | | * | | refactor: separate out console and status report generation parts of XEngine | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -1/+6 | |
| | | | | | ||||||
| | * | | | Terrain: added [Terrain] section with an option to load an initial flat ↵ | Diva Canto | 2012-03-16 | 3 | -19/+59 | |
| | |/ / | | | | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-15 | 8 | -114/+174 | |
| | |\ \ | ||||||
| | | * | | Allow comments to appear in command scripts (e.g. shutdown_commands.txt). | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | These can start with ; # or // | |||||
| | | * | | In Top Scripts report, don't show scripts with no or less than 1 microsecond ↵ | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | of execution time. This is to make the report clearer and less confusing. | |||||
| | | * | | Aggregate script execution times by linksets rather than individual prims. | Justin Clark-Casey (justincc) | 2012-03-16 | 4 | -4/+23 | |
| | | | | | | | | | | | | | | | | | This is for the top scripts report. | |||||
| | | * | | Fix owner name display in "Top Colliders" and "Top Script" region reports. | Justin Clark-Casey (justincc) | 2012-03-16 | 1 | -45/+1 | |
| | | | | | ||||||
| | | * | | Replace script-lines-per-second with the script execution time scaled by its ↵ | Justin Clark-Casey (justincc) | 2012-03-16 | 7 | -70/+145 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | measurement period and an idealised frame time. The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute. Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100. The actual measurement value should be script execution time per frame but XEngine does not work this way. Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time. This is still not ideal but gives reasonable results and allows scripts to be compared. This commit moves script execution time calculations from SceneGraph into IScriptModule implementations. | |||||
| | * | | | More on map search: send extra messages to the user regarding the region ↵ | Diva Canto | 2012-03-15 | 1 | -0/+11 | |
| | |/ / | | | | | | | | | | being found or not, because the UI is horribly confusing -- places profile is always "loading..." whether the region exists or not. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-15 | 7 | -5/+273 | |
| | |\ \ | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |