aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | some more work on costsUbitUmarov2012-03-163-22/+192
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-1833-283/+1046
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | 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-173-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 Canto2012-03-173-55/+62
| | | | | | | | | | | | UserManagementModule where it belongs. No functional changes.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-173-0/+30
| |\ \
| | * | Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927Justin Clark-Casey (justincc)2012-03-173-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 Canto2012-03-173-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" 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-163-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/opensimDiva Canto2012-03-1510-118/+185
| |\ \ \ | | |/ /
| | * | 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)
| | * | 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 //
| | * | 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.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-154-225/+158
| |\ \ \ | | |/ /
| * | | More hacking around viewer bugDiva Canto2012-03-151-1/+1
| | | |
| * | | Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
| | | |
* | | | Merge branch 'ubitwork'Melanie2012-03-1513-21/+276
|\ \ \ \
| * | | | Playing with object costs CAPS ...UbitUmarov2012-03-151-2/+118
| | | | |
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-151-1/+1
| |\ \ \ \
| * | | | | added ObjectPhysicsProperties http event message to send viewer that data. ↵UbitUmarov2012-03-1510-1/+76
| | | | | | | | | | | | | | | | | | | | | | | | For now on caps/EventQueue, and still only used on a material change...
| * | | | | bug fixs, added a default physics shape estimator based on being a mesh or ↵UbitUmarov2012-03-144-18/+82
| | | | | | | | | | | | | | | | | | | | | | | | not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
* | | | | | Merge branch 'master' into careminsterMelanie2012-03-154-229/+155
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | | | Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-152-170/+115
| | | | |
| * | | | Simplify some logic in the ScriptInstance constructor - running is set to ↵Justin Clark-Casey (justincc)2012-03-151-9/+3
| | | | | | | | | | | | | | | | | | | | false in both if/else branches
| * | | | minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-151-13/+12
| | | | |
| * | | | Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-151-17/+11
| | | | |
| * | | | Fix a problem where multiple near simultaneous calls to llDie() from ↵Justin Clark-Casey (justincc)2012-03-152-20/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | multiple scripts in the same linkset can cause unnecessary thread aborts. The first llDie() could lock Scene.m_deleting_scene_object. The second llDie() would then wait at this lock. The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away. Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead. This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
| * | | | Alleviate an issue where calling Thread.Abort() on script WorkItems can fail ↵Justin Clark-Casey (justincc)2012-03-152-4/+15
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to release locks, resulting in a crippled simulator. This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well. It has been seen to happen when llDie() is called in a linkset running more than one script. Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete. Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time. Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
* | | | Allow llTeleportAgent to teleport gods when not in god modeMelanie2012-03-141-1/+1
| |/ / |/| |
* | | Merge branch 'master' into careminsterMelanie2012-03-1414-70/+147
|\ \ \ | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-133-25/+50
| |\ \
generated by cgit v1.1 at 2024-12-23 23:01:24 +0000