aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2013-02-012-7/+18
|\
| * Stop exceptions being thrown if GenerateMapTiles = false but no static map ↵Justin Clark-Casey (justincc)2013-02-022-7/+18
| | | | | | | | tile has been set. Do more informative warn instead.
* | Update assembly version numbersBlueWall2013-02-011-1/+1
|/
* Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2013-01-311-18/+63
|\
| * Allow use of MaptileStaticUUID in Regions.ini to override the global setting ↵Jak Daniels2013-01-301-18/+63
| | | | | | | | | | | | in OpenSim.ini for each region. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Added option for UUID as command parameters. This lets the command handle ↵Dan Lake2013-01-311-0/+4
|/ | | | the UUID parsing and type checking before the command is executed.
* minor: Tidy up disabled logging on AssetTransactionModule for future use. ↵Justin Clark-Casey (justincc)2013-01-291-8/+10
| | | | Make it clear that transaction parameter to HandleUDPUploadRequest is an ID.
* Prevent items being destroyed by rename operations. Renaming of a wearable alsoMelanie2013-01-271-1/+2
| | | | | | | | | sends an asset transaciton but it is empty. So we can't ignore name data when a transaction is present and can't treat every transaction as valid. Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
* Fix issue where the "set terrain texture" console command did not tell the ↵Justin Clark-Casey (justincc)2013-01-261-1/+1
| | | | | | viewers that textures had updated (hence they did not display the changes). Addresses http://opensimulator.org/mantis/view.php?id=6513
* minor: Fix full scene part console report to show proper Light* names rather ↵Justin Clark-Casey (justincc)2013-01-261-5/+5
| | | | than all wrongly FlexiDrag
* Add basic JsonCreateStore() regression testJustin Clark-Casey (justincc)2013-01-251-1/+1
|
* Mantis 6508 llHTTPResponse body is incorrectly interpreted by IETalun2013-01-241-1/+15
| | | | | | | | | This patch html escapes responses going to IE so that they cannot be interpreted as HTML if the response type is "text/plain". This has no effect if the reponse type has been set to "text/html" by osSetContentType Signed-off-by: nebadon <michael@osgrid.org>
* Changed a couple of debug messages at the request of osgrid.Diva Canto2013-01-161-2/+2
|
* Implement a workaround solution for saving manual script state changes by ↵Justin Clark-Casey (justincc)2013-01-111-5/+19
| | | | | | | the user before logout instead of wrongly removing the script early. This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen. This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
* Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
| | | | | | | This involves making Attachments module listen for start/stop script changes. It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim. Not just in a state where their scripts have been stopped.
* Move scene debug commands into separate module. Command changes from "debug ↵Justin Clark-Casey (justincc)2013-01-101-7/+12
| | | | scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
* On baked texture save, replace any HG ID with an ordinary asset ID so the ↵Justin Clark-Casey (justincc)2013-01-101-0/+3
| | | | HGAssetBroker doesn't try to save back to the avatar's originating region
* minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ↵Justin Clark-Casey (justincc)2013-01-031-1/+4
| | | | we're deselecting the prim in code before scheduling an update on attachment
* Fix problem where object attached from ground often does not get attached ↵Justin Clark-Casey (justincc)2013-01-031-9/+1
| | | | | | | | properly. It seems this is happening because we send a kill for objects that are selected when attached. A code comment says that this is to get the client to deselect it, but v3 and v1 clients do this just fine without the kill. Aims to address http://opensimulator.org/mantis/view.php?id=6456
* minor: Change channel digger replacement message in TerrainModule to Info ↵Justin Clark-Casey (justincc)2013-01-031-1/+1
| | | | | | from Warn. This is to stop this unnecessarily triggering log analysis code which reports warn and error level statements.
* Fixed several problems with the Sun: some settings didn't work, or were ↵Oren Hurvitz2013-01-022-20/+27
| | | | inconsistently used. - The sun position is always calculated by combining the sun settings in the Region and Estate. This fixes the problem that 'UseEstateSun' didn't work. - To remove ambiguity, the EstateToolsSunUpdate event no longer accepts the sun's position as parameters. That's because the position is always calculated from the Region and Estate settings. - Use only the 'FixedSun' flag to determine whether the sun is fixed; not the 'UseGlobalTime' flag. - Don't change the region's 'SunPosition' field according to the sun's position: this field is used only to set the position when using a FixedSun. (The 'SunVector' field does get updated according to the sun's position in the sky)
* Fixed: the AvatarEnteringNewParcel event wasn't triggered in some casesOren Hurvitz2013-01-021-0/+6
| | | | If an avatar moved between regions: A -> B -> A, then when returning to region A the AvatarEnteringNewParcel wasn't triggered. This happened because the ScenePresence in region A still remembered its previous 'currentParcelUUID', so it appeared as if the avatar didn't change parcels. Now, however, when a ScenePresence becomes a child presence we clear its 'currentParcelUUID'.
* minor: minor code and log formatting fixes to recent changes in ↵Justin Clark-Casey (justincc)2013-01-021-5/+6
| | | | LandManagementModule
* Changed locks to prevent deadlocks (especially during multi-region Load OAR)Oren Hurvitz2013-01-023-39/+61
|
* If Save OAR/IAR times-out while waiting for assets then notify the caller ↵Oren Hurvitz2013-01-024-26/+37
| | | | that the operation failed
* Implemented Return Objects when it's invoked from the Top Colliders or Top ↵Oren Hurvitz2013-01-021-5/+55
| | | | Scripts dialogs
* Fix sounds so that they play from inventory after teleport rather than only ↵Justin Clark-Casey (justincc)2012-12-131-2/+2
| | | | | | | | | on initial login region. Regression from commit ed162a10 (Fri Oct 5 13:50:12 2012) We had started listening for the client login event for attaching the sound trigger event rather than OnNewClient Addresses http://opensimulator.org/mantis/view.php?id=6453 Many thanks to danbanner for identifying the exact commit where this went wrong, which made identifying the fix easy.
* HGAssetMapper: Get wasn't really working. It's true that some assets are ↵Diva Canto2012-12-091-3/+35
| | | | copied in the process of being gathered their UUID, but not all. Specifically, terminal assets like textures aren't copied. We have to go one more time through the ids.
* UserManagementModule: search the local cache for names too.Diva Canto2012-12-091-0/+10
| | | | Inventory transfers: don't do async on asset transfers or now.
* Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message ↵Justin Clark-Casey (justincc)2012-12-081-70/+68
| | | | | | | | | | to nominate a non-root destination folder. This is in relation to http://opensimulator.org/mantis/view.php?id=6311 This is after further analysis which shows the viewer expects the server to move the folder for #RLV give but then should be renaming the folder itself. For some reason this is not happening, possibly because we are not sending BulkUpdates or because we are not using transaction IDs properly. This needs to be fixed in the future. However, moving the folder even if the rename isn't correctly triggered in the viewer seems preferable to disabling this code altogether.
* minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-055-5/+16
| | | | overriding OpenSimTestCase.SetUp()
* minor: also comment out the debug log message which reports searching for ↵Justin Clark-Casey (justincc)2012-12-041-2/+2
| | | | child agents in simulator scenes for now.
* minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
|
* Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-271-3/+57
|\
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-11-281-0/+3
| |\
| * | Show many more primitive properties on console command "show part name/id/pos"Justin Clark-Casey (justincc)2012-11-281-3/+57
| | |
* | | Bug fix in Offline IM for inventory transfers. The items were being placed ↵Diva Canto2012-11-271-11/+15
| |/ |/| | | | | twice in the receiver's inventory.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-2721-406/+467
|\ \ | |/
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-249-10/+10
| | | | | | | | automatically turns off any logging enabled between tests
| * In ArchiverTests, use the local instantiated SceneManager rather than ↵Justin Clark-Casey (justincc)2012-11-241-20/+7
| | | | | | | | potentially cross-contaminating tests by relying on the static SceneManager.Instance
| * Fix bug where loading an OAR with a deeded parcel would always set the ↵Justin Clark-Casey (justincc)2012-11-245-147/+224
| | | | | | | | | | | | | | | | | | parcel owner ID to the estate owner even if the group UUID was present. Aims to address http://opensimulator.org/mantis/view.php?id=6355 As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records (i.e. no membership data etc) This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
| * minor: Add some currently commented out debug log lines for investigating ↵Justin Clark-Casey (justincc)2012-11-231-0/+5
| | | | | | | | issues resolving group IDs for land parcels on OAR loading where groups do not exist
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2012-11-232-3/+3
| |
| * Add AllowRegionRestartFromClient setting to [EstateManagement] section of ↵Justin Clark-Casey (justincc)2012-11-231-40/+63
| | | | | | | | | | | | | | | | | | OpenSim.ini. Setting this to false will block all restart requests from the viewer even if they are otherwise legitimate. One use is to block region restarts if necessary whilst restart functionality remains buggy or triggers bugs in modules, though these should be fixed as soon as practicable. Default is true, as has been the case historically.
| * Remove the redundant BypassPermissions() checks in EstateManagmentModule.Justin Clark-Casey (justincc)2012-11-231-8/+13
| | | | | | | | This is repeated in the PermissionsModule and checking it earlier does not allow a force override of the bypass value
| * minor: Add some console feedback on region restart and log who requested a ↵Justin Clark-Casey (justincc)2012-11-232-1/+9
| | | | | | | | region restart if done from the viewer.
| * If GetAgents() is called with an empty userIDs array then don't bother with ↵Justin Clark-Casey (justincc)2012-11-201-0/+4
| | | | | | | | | | | | | | a useless potentially network call on the scene presence service connector. This also eliminates the "[PRESENCE HANDLER]: GetAgents called without required uuids argument" which has started to pop up in the logs when a call is made with an empty uuid array as occasionally happens.
| * refactor: Move common presence connector code into BasePresenceServiceConnectorJustin Clark-Casey (justincc)2012-11-204-193/+145
| |
* | Prevent the core Groups module from being enabled when its name doesn't ↵Diva Canto2012-11-271-0/+3
|/ | | | match the "default" ini choice