aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-161-0/+11
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-1514-227/+191
| |\
| * | 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.
* | | Improve threadpool reporting to "show threads" console command (also gets ↵Justin Clark-Casey (justincc)2012-03-162-7/+57
| |/ |/| | | | | printed out periodically)
* | 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.
* 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
|\ \ | |/
| * 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.
* | 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 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-133-25/+50
|\
| * refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵Justin Clark-Casey (justincc)2012-03-143-25/+50
| | | | | | | | | | | | it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event) Also add other various illustrative comments
* | Teleports: bounce off repeated requests of teleporting the same agent. Some ↵Diva Canto2012-03-131-0/+13
| | | | | | | | scripts do that, and that fails the whole thing.
* | Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-137-9/+15
|\ \ | |/
| * Add max thread and min thread information to "xengine status" region console ↵Justin Clark-Casey (justincc)2012-03-122-0/+5
| | | | | | | | command
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-124-4/+9
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
| * Change OpenSim.ini.example to reflect how to actually enable prim limits,Melanie2012-03-121-5/+1
| | | | | | | | as opposed to how it was first designed.
* | Datasnapshot: added "secret" to the registration/deregistration query so ↵Diva Canto2012-03-132-33/+28
|/ | | | that data providers can verify authenticity if they want.
* DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the ↵Diva Canto2012-03-121-2/+2
| | | | capitalization of 'name' to lower case, also in the same <grid> section.
* Added osGetGridGatekeeperURI()Diva Canto2012-03-103-0/+20
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-1011-114/+257
|\
| * Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate ↵Justin Clark-Casey (justincc)2012-03-101-1/+1
| | | | | | | | | | | | thread. This was previous behaviour anyway.
| * minor: In IAR save, log when we start adding the control file rather than ↵Justin Clark-Casey (justincc)2012-03-101-2/+3
| | | | | | | | saying afterwards that we added it.
| * minor: rearrange some save oar messages so they say what they're about to do ↵Justin Clark-Casey (justincc)2012-03-101-8/+7
| | | | | | | | rather than what they've just done.
| * On OAR saving, try fetch assets serially rather than firing all the requests ↵Justin Clark-Casey (justincc)2012-03-102-9/+18
| | | | | | | | | | | | | | at the asset service at once. This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898 Quick tests show that save time is the same.
| * Add satguru and Fernando to contributorsJustin Clark-Casey (justincc)2012-03-101-0/+2
| |
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-102-67/+171
| | | | | | | | | | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
| * Factor out common default animations code into SLUtil. LLClientView now ↵Justin Clark-Casey (justincc)2012-03-094-62/+55
| | | | | | | | | | | | makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. As per opensim-users mailing list discussion.
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-03-094-6/+85
| |\
generated by cgit v1.1 at 2024-12-22 11:51:49 +0000