aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-222-70/+91
|\ | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-30/+28
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-212-69/+92
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge branch 'master' into careminsterMelanie2012-01-214-2/+197
|\ \ | |/
| * Telehub Support:BlueWall2012-01-202-1/+194
| | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
| * Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-191-1/+1
| |
| * RegionReady:BlueWall2012-01-181-0/+2
| | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-162-0/+9
| |
* | Add some loggingMelanie2012-01-171-0/+41
| |
* | Fix prim calculations so that > 32767 prims are supportedMelanie2012-01-171-2/+4
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-162-0/+9
| |
* | Merge branch 'master' into careminsterMelanie2012-01-143-25/+57
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
| * Register the UrlModule for script engine events OnScriptRemoved and ↵Justin Clark-Casey (justincc)2012-01-141-1/+8
| | | | | | | | | | | | | | | | | | OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script. Doing this in every script is unnecessary since the event trigger is parameterized by the item id. All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException. Registration moved to UrlModule so that the handler is registered for all script engine implementations. This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
| * Fix improper code formatting introduced in 6214e6a217cfBo Iwu2012-01-131-24/+40
| | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Update RegionReadyModuleBlueWall2012-01-131-1/+9
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Allow SmtpClients and other SSL users to work with our cert handler installedMelanie2012-01-141-9/+25
| |
* | Merge branch 'master' into careminsterMelanie2012-01-131-93/+0
|\ \ | |/
| * Undo some prior workBlueWall2012-01-121-93/+0
| | | | | | | | Move some added fuctions out of core into the addon module to keep things clean
* | Merge branch 'master' into careminsterMelanie2012-01-121-33/+2
|\ \ | |/
| * Renamed one var and deleted commented code. No functional changes.Diva Canto2012-01-121-33/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-126-59/+79
|\ \ | |/
| * Allow update of stored entries within User Management Module-this is needed ↵Bo Iwu2012-01-121-48/+52
| | | | | | | | | | | | for proper work of HG friends. See http://opensimulator.org/mantis/view.php?id=5847
| * HG: normalize all externalized user ULRs to be the Home URL, i.e. the ↵Diva Canto2012-01-123-10/+17
| | | | | | | | location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
| * If deserializing a scene object fails during IAR load then ignore the object ↵Justin Clark-Casey (justincc)2012-01-111-1/+4
| | | | | | | | rather than halting the IAR load with an exception.
| * Add a check to see if an asset exists before recreating it whileMic Bowman2012-01-101-0/+6
| | | | | | | | | | | | loading an archive. This does add an extra roundtrip to the asset server if loading new assets but it protects against overwriting (and potentially corrupting) existing assets.
* | Adapt a cast to using the new TeleportFlagsMelanie2012-01-111-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-3/+3
|\ \ | |/
| * Add avatar names to appearance log messagesJustin Clark-Casey (justincc)2012-01-101-3/+3
| |
* | Merge branch 'master' into careminsterMelanie2012-01-101-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG Friends: fixed bug introduced by 571efeddb20f38bb4164074b3c217be5387ca2e0 ↵Diva Canto2012-01-101-2/+2
| | | | | | | | (r/17672)
| * Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Don't try to save a NPCs attachment states on NPC deleteMelanie2012-01-071-0/+8
| |
* | Merge branch 'master' into careminsterMelanie2012-01-062-12/+30
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Improve "j2k decode" command to tell us how many layers and components were ↵Justin Clark-Casey (justincc)2012-01-051-5/+16
| | | | | | | | decoded, instead of just success/failure
| * Add a "j2k decode" region console command that allows a manual request for a ↵Justin Clark-Casey (justincc)2012-01-051-8/+10
| | | | | | | | | | | | JPEG2000 decode of an asset For debugging purposes.
| * Improve "app rebake" command to return a better message if no uploaded ↵Justin Clark-Casey (justincc)2012-01-051-1/+6
| | | | | | | | texture ids were available for the rebake request
* | Merge branch 'master' into careminsterMelanie2012-01-054-32/+154
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Add "appearance rebake" command to ask a specific viewer to rebake textures ↵Justin Clark-Casey (justincc)2012-01-041-3/+12
| | | | | | | | | | | | | | | | from the server end. This is not as useful as it sounds, since you can only request rebakes for texture IDs already received. In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect. Nonetheless, this is useful for diagnostic/debugging purposes.
| * Separate out rebake request code from cache validation code AvatarFactoryModule.Justin Clark-Casey (justincc)2012-01-041-31/+41
| | | | | | | | This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
| * Minor formatting changes and commented out log lines for future debugging of ↵Justin Clark-Casey (justincc)2012-01-041-0/+4
| | | | | | | | image manager (udp texture fetch). No significant functional changes.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-032-0/+5
| |\
| * \ Merge branch 'new_modules'BlueWall2012-01-032-5/+100
| |\ \
| | * | Profile UpdatesBlueWall2012-01-032-5/+100
| | | | | | | | | | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | | | Merge branch 'master' into careminsterMelanie2012-01-0212-519/+101
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * | | Adding commented out log messages and some minor formatting for future bug ↵Justin Clark-Casey (justincc)2012-01-022-0/+5
| |/ / | | | | | | | | | hunting. No functional changes.
| * | Fix for failed http request statusBlueWall2012-01-011-14/+17
| |/ | | | | | | Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
| * Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout ↵Diva Canto2011-12-296-36/+78
| | | | | | | | region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
| * Deleted two obsolete files in Inventory modules.Diva Canto2011-12-292-460/+0
| |
| * Deleted unused methods from HGAssetBrokerDiva Canto2011-12-291-18/+0
| |