aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+7
|\
| * Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-211-1/+7
| | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
* | Removed extraneous debug messages. Added a check for UUID.Zero.Diva Canto2012-03-201-16/+23
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
|\
| * fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| |
* | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
|\ \ | |/
| * refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
| |
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-202-9/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-2/+0
| |
| * 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
* | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-205-167/+276
| | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵Diva Canto2012-03-172-7/+34
|/ | | | direct user connections.
* 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-171-0/+62
| | | | UserManagementModule where it belongs. No functional changes.
* Region access control! Region operators can now specify things like ↵Diva Canto2012-03-172-27/+140
| | | | 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
|
* Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-161-1/+6
| | | | 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-151-72/+51
|\
| * 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.
| * 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-161-30/+47
| | | | | | | | | | | | | | | | | | | | | | 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.
* 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.
* More hacking around viewer bugDiva Canto2012-03-151-1/+1
|
* Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
|
* 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.
* 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.
* More on inventory transfer hold ups:Diva Canto2012-03-092-2/+77
| | | | | | - Added an inventory cache for caching root and system folders - Synchronized the remote inventory connector, so that all the remote inventory calls are serialized This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
* More on HG inventory transfers. Move the FireAndForget higher up.Diva Canto2012-03-091-1/+1
|
* More on the freeze on HG inventory transfers: spawn a threadlet on the ↵Diva Canto2012-03-081-1/+1
| | | | functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
* Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-091-2/+5
|\
| * Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-021-2/+11
| |\
| * | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* | | Uses shorter AddCommand form for "show estates"Justin Clark-Casey (justincc)2012-03-081-1/+1
| | |
* | | Display help commander topics in capitalized form - the commands themselves ↵Justin Clark-Casey (justincc)2012-03-081-40/+7
| | | | | | | | | | | | | | | | | | are still lowercase. Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
* | | Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-0815-44/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | | Remove static m_MainInstance in LocalGridServiceConnector.Justin Clark-Casey (justincc)2012-03-061-24/+10
| | | | | | | | | | | | | | | I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case. Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
* | | Add sensor, dataserver requests, timer and listener counts to "xengine ↵Justin Clark-Casey (justincc)2012-03-061-0/+20
| |/ |/| | | | | | | | | status" command. This is for diagnostic purposes.
* | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
|/
* Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | Signed-off-by: nebadon <michael@osgrid.org>
* HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵Diva Canto2012-02-251-1/+1
| | | | there.