aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.7.3-post-fixes' of ssh://opensimulator.org/var/git/opensim ↵Diva Canto2012-03-228-31/+219
|\ | | | | | | into 0.7.3-post-fixes
| * Comment out a terrain save-tile debugging message that accidentally crept in ↵Justin Clark-Casey (justincc)2012-03-221-6/+6
| | | | | | | | with c4b2d24
| * refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵Justin Clark-Casey (justincc)2012-03-221-11/+8
| | | | | | | | MoveTaskInventoryItem()
| * Fix llGiveInventory() so that it checks the destination part for ↵Justin Clark-Casey (justincc)2012-03-222-6/+63
| | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case.
| * Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-225-6/+134
| | | | | | | | owned by the same user.
| * Add prim name to "[MESH]: No recognized physics mesh..." log messageJustin Clark-Casey (justincc)2012-03-221-1/+1
| |
| * Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at ↵Justin Clark-Casey (justincc)2012-03-221-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.
* | Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
| | | | | | | | Fixes perms boo-boo
* | Rework Diva's patch to simplify itMelanie2012-03-222-16/+29
|/
* Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
|
* 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
* Clean up "save iar" helpJustin Clark-Casey (justincc)2012-03-191-8/+8
|
* refactor: separate out console and status report generation parts of XEngineJustin Clark-Casey (justincc)2012-03-191-1/+6
|
* In Top Scripts report, don't show scripts with no or less than 1 microsecond ↵Justin Clark-Casey (justincc)2012-03-191-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-194-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-191-45/+1
|
* Replace script-lines-per-second with the script execution time scaled by its ↵Justin Clark-Casey (justincc)2012-03-197-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.
* Remove property/field duplication in ScriptInstance where it's unnecessary.Justin Clark-Casey (justincc)2012-03-192-170/+115
|
* Simplify some logic in the ScriptInstance constructor - running is set to ↵Justin Clark-Casey (justincc)2012-03-191-9/+3
| | | | false in both if/else branches
* FireAndForget scripted rez - port from AvinationMelanie2012-03-191-41/+46
|
* minor: correct indentation levelsJustin Clark-Casey (justincc)2012-03-191-13/+12
|
* Remove duplication of m_RunEvents and RunningJustin Clark-Casey (justincc)2012-03-191-17/+11
|
* Fix a problem where multiple near simultaneous calls to llDie() from ↵Justin Clark-Casey (justincc)2012-03-192-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-192-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.
* refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make ↵Justin Clark-Casey (justincc)2012-03-193-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
* Add max thread and min thread information to "xengine status" region console ↵Justin Clark-Casey (justincc)2012-03-192-0/+5
| | | | command
* Add documentation to make more explicit the difference between OnRezScript ↵Justin Clark-Casey (justincc)2012-03-191-5/+20
| | | | | | | and OnNewScript in the event manager OnNewScript fires when a script is added to a scene OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
* Remove unnecessary explicit ElapsedEventHandler in SimReporterJustin Clark-Casey (justincc)2012-03-191-1/+1
|
* Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-198-12/+136
| | | | | | status" command. This is for diagnostic purposes.
* Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()Justin Clark-Casey (justincc)2012-03-191-8/+14
| | | | | | | They were all failing assertions but the exceptions these threw were caught as expected Exceptions. I don't think we can easily distinguish these from the Exceptions that we're expecting. So for now we'll do some messy manually checking with boolean setting instead. This patch also corrects the assertions themselves.
* Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that ↵Justin Clark-Casey (justincc)2012-03-198-26/+228
| | | | they're running
* Fix off by one error in script error reporting.Justin Clark-Casey (justincc)2012-03-191-1/+1
|
* Simplify NPCModuleTests code by putting the NPCModule in an instance ↵Justin Clark-Casey (justincc)2012-03-191-61/+56
| | | | | | variable rather than making each test fetch it seperately. Also rename instance variables in the test to conform to naming standards and for understandability
* 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.
* Datasnapshot: added "secret" to the registration/deregistration query so ↵Diva Canto2012-03-162-33/+28
| | | | that data providers can verify authenticity if they want.
* DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the ↵Diva Canto2012-03-161-2/+2
| | | | capitalization of 'name' to lower case, also in the same <grid> section.
* 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. Conflicts: bin/OpenSim.ini.example
* 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.
* 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 0434758a0d2d968063456a4b903a5251d2e437ab.
* Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570""Diva Canto2012-03-151-1/+13
| | | | This reverts commit 09ff121654ca3d3444571507030435020e64133a.
* Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| | | | This reverts commit d7651a389e0a5bbd1a1bfc95fa0cb8823b839dad.
* Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| | | | This reverts commit 8bb0a710836c5c669a96f7a602b48fdda3923574.
* More hacking around viewer bugDiva Canto2012-03-151-1/+1
|
* Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
|
* Go back to setting appearance directly in NPCModule.SetAppearance() to fix ↵Justin Clark-Casey (justincc)2012-03-062-9/+57
| | | | | | | | | | mantis 5914 The part reverted is from commit 2ebb421. Unfortunately, IAvatarFactoryModule.SetAppearance() does not transfer attachments. I'm not sure how to do this separately, unfortunately I'll need to leave it to Dan :) Regression test added for this case. Mantis ref: http://opensimulator.org/mantis/view.php?id=5914
* Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
|
* Move SenseRepeaters.Count check inside the SenseRepeatListLock.Justin Clark-Casey (justincc)2012-03-021-4/+4
| | | | No methods in the List class are thread safe in the MS specification/documentation