aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-253-33/+61
|\
| * Hack example on to "terrain save-tile" extended help.Justin Clark-Casey (justincc)2012-03-241-0/+6
| | | | | | | | Thanks to Garmin Kawaguichi for the initially suggested text.
| * Use system provided temporary file in "terrain save-tile" to avoid problems ↵Justin Clark-Casey (justincc)2012-03-241-3/+3
| | | | | | | | | | | | with drive letters on windows Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted).
| * Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-242-30/+52
| |
* | Merge branch 'master' into careminsterMelanie2012-03-231-6/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Comment out a terrain save-tile debugging message that accidentally crept in ↵Justin Clark-Casey (justincc)2012-03-221-6/+6
| | | | | | | | with c4b2d24
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-221-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-221-7/+10
| |\
| * | Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-221-0/+6
| | | | | | | | | | | | owned by the same user.
* | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-7/+10
|\ \ \ | | |/ | |/|
| * | HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |/
| * Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
| | | | | | | | Fixes perms boo-boo
* | Merge branch 'master' into careminsterMelanie2012-03-226-60/+139
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Rework Diva's patch to simplify itMelanie2012-03-222-16/+29
| |
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-222-69/+6
| | | | | | | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵Diva Canto2012-03-222-6/+69
| | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-212-7/+26
| | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
| * HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that ↵Diva Canto2012-03-213-20/+58
| | | | | | | | we can better manage this traffic.
| * Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| |
| * 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' into careminsterMelanie2012-03-216-167/+303
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-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
| |\ \
| * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-202-9/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * | | | 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.
* | | | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | fix compile error from last commitJustin Clark-Casey (justincc)2012-03-211-1/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' into careminsterMelanie2012-03-211-18/+7
|\ \ \ \ | |/ / /
| * | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()Justin Clark-Casey (justincc)2012-03-211-18/+7
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-03-201-2/+0
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | remove some mono compiler warningsJustin Clark-Casey (justincc)2012-03-201-2/+0
| | |
* | | Merge branch 'master' into careminsterMelanie2012-03-201-7/+2
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * | 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
* | Merge branch 'master' into careminsterMelanie2012-03-1810-145/+482
|\ \ | |/ | | | | | | | | | | 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-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
generated by cgit v1.1 at 2024-12-26 11:22:50 +0000