aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Store and reload extra physics from databaseMelanie2012-03-201-2/+20
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-2018-65/+197
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * | Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| | |
| * | Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| | |
| * | Fix small typoJustin Clark-Casey (justincc)2012-03-201-1/+1
| | |
| * | Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵Justin Clark-Casey (justincc)2012-03-201-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-191-0/+7
| | |
| * | Fix a bug where logins to standalones would fail if the RegionReady module ↵Justin Clark-Casey (justincc)2012-03-191-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-191-4/+4
| | | | | | | | | | | | | | | | | | scripts in a region. Addresses http://opensimulator.org/mantis/view.php?id=5940
| * | Move startup/shutdown command .txt files to .txt.example files to avoid ↵Justin Clark-Casey (justincc)2012-03-194-6/+6
| | | | | | | | | | | | | | | | | | clobbering on updates. Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
| * | Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-197-16/+154
| |/ | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | Remove debug output using Console.WriteLine and trim excessive whitespaceMelanie2012-03-191-8/+0
| |
* | Merge branch 'ubitwork'Melanie2012-03-1910-22/+4949
|\ \
| * | added a new UbitMeshing module so i can mess it...UbitUmarov2012-03-177-0/+4757
| | |
| * | some more work on costsUbitUmarov2012-03-163-22/+192
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-1848-399/+1088
|\ \ \ | |/ / |/| / | |/ | | | | | | 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 Canto2012-03-171-2/+6
| |
| * More on HG access control. This commit splits the UserManagementModule into ↵Diva Canto2012-03-175-40/+184
| | | | | | | | 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.
| * BAD JUSTIN!Diva Canto2012-03-173-0/+3
| | | | | | | | | | People using standalone in master, please update your StandaloneCommon.ini according to this change. People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
| * Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ↵Diva Canto2012-03-173-55/+62
| | | | | | | | UserManagementModule where it belongs. No functional changes.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-174-0/+31
| |\
| | * Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-174-0/+31
| | | | | | | | | | | | | | | 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 Canto2012-03-179-35/+166
| |/ | | | | | | 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" helpJustin Clark-Casey (justincc)2012-03-171-8/+8
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-163-8/+71
| |\
| | * minor: reuse threadpool count we just fetched instead of fetching it againJustin Clark-Casey (justincc)2012-03-161-1/+1
| | |
| | * Add total scripts count to "show threads"Justin Clark-Casey (justincc)2012-03-161-2/+10
| | | | | | | | | | | | However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
| | * refactor: separate out console and status report generation parts of XEngineJustin Clark-Casey (justincc)2012-03-161-1/+6
| | |
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-161-0/+11
| | |\
| | * | Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-162-7/+57
| | | | | | | | | | | | | | | | printed out periodically)
| * | | Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-165-20/+65
| | |/ | |/| | | | | | | 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/opensimDiva Canto2012-03-1514-227/+191
| |\ \ | | |/
| | * Add process working memory to "show stats" memory statistics.Justin Clark-Casey (justincc)2012-03-162-4/+11
| | | | | | | | | | | | This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
| | * Move startup_commands.txt.example to startup_commands.txt for consistency ↵Justin Clark-Casey (justincc)2012-03-163-4/+4
| | | | | | | | | | | | | | | | | | with the existing shutdown_commands.txt. Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
| | * Remove unnecessary "backup" command in shutdown_commands.txtJustin Clark-Casey (justincc)2012-03-161-1/+2
| | | | | | | | | | | | The simulator is already doing this internally.
| | * Allow comments to appear in command scripts (e.g. shutdown_commands.txt).Justin Clark-Casey (justincc)2012-03-161-1/+5
| | | | | | | | | | | | These can start with ; # or //
| | * Remove unused bin/ScriptEngines/Default.lslJustin Clark-Casey (justincc)2012-03-161-104/+0
| | | | | | | | | | | | | | | It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default. At this location it would also stop an easy manual deletion of script engine compiles and state.
| | * In Top Scripts report, don't show scripts with no or less than 1 microsecond ↵Justin Clark-Casey (justincc)2012-03-161-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-164-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-161-45/+1
| | |
| | * Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)2012-03-167-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 Canto2012-03-151-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/opensimDiva Canto2012-03-157-5/+273
| |\
| | * Protect the scriptmodulecomms interface.Mic Bowman2012-03-151-1/+4
| | |
| | * Adds a new script command 'modInvoke' to invoke registered functionsMic Bowman2012-03-157-5/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | from region modules. The LSL translator is extended to generate the modInvoke format of commands for directly inlined function calls. A region module can register a function Test() with the name "Test". LSL code can call that function as "Test()". The compiler will translate that invocation into modInvoke("Test", ...)
| * | More on SLURLs and V3. This is hacky, but it works. Basically, we have to ↵Diva Canto2012-03-151-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | redefine the encoding of HG URLs because the viewer messes them up. Examples of what works and doesn't work: - secondlife://ucigrid00.nacs.uci.edu|8002/128/128 <-- works throughout the viewer - secondlife://http|!!ucigrid00.nacs.uci.edu|8002+Test+Zone+1/128/128 <-- works throughout the viewer - secondlife://http|!!grid.sciencesim.com!grid!hypergrid.php+Yellowstone01+74/128/128 <-- works throughout - secondlife://http%3A%2F%2Fucigrid00.nacs.uci.edu%3A8002%20UCI%20Central%201/128/128 <-- works in chat, but not as URLs in the webkit
| * | Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
| | | | | | | | | | | | This reverts commit e5612553ce57b6e36cfa59db8450473099054da1.
| * | These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ↵Diva Canto2012-03-151-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | needed. Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"" This reverts commit 5a9560db288a25799c93a3ecbd3544931149fa2a.
| * | Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| | | | | | | | | | | | This reverts commit 697ac7fd9de244cb3b25ff8576838fd323b257c3.
| * | Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| | | | | | | | | | | | This reverts commit 10731732b4d40ec9d9e7a21f406a3d2b5dfc1075.
generated by cgit v1.1 at 2024-12-22 03:31:08 +0000