aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-01-261-11/+13
|\
| * Change references from sop to sog and add protection from null refBlueWall2012-01-261-11/+13
| | | | | | | | I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes.
* | Merge branch 'master' into careminsterMelanie2012-01-262-3/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
| | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar"
| * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-251-1/+10
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-01-251-15/+66
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-251-2/+51
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * Telehub map items displayedBlueWall2012-01-241-3/+51
| | |
| * | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ | | | | | | cover a potential nullref
* | Merge branch 'master' into careminsterMelanie2012-01-251-0/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Put Telehubs on the mapBlueWall2012-01-241-0/+18
| |
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-242-58/+30
| | | | | | | | spwan point positioning on rotated telehubs.
| * Reverse the spawn point distance vectorMelanie2012-01-241-1/+1
| |
| * Correct a coordinate to make the viewer like itMelanie2012-01-241-1/+1
| |
* | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-242-58/+30
| | | | | | | | spwan point positioning on rotated telehubs.
* | Reverse the spawn point distance vectorMelanie2012-01-241-1/+1
| |
* | Correct a coordinate to make the viewer like itMelanie2012-01-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-242-94/+85
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-242-83/+65
| | | | | | | | additional redundant information.
| * Add update to Telehub position and rotation before adding SpawnPointsBlueWall2012-01-231-4/+11
| |
| * Cleanup BlueWall2012-01-231-3/+6
| |
| * Cleanup unused parts, add some error handlingBlueWall2012-01-231-53/+52
| |
* | 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
|\ \ | |/
generated by cgit v1.1 at 2024-10-23 14:29:40 +0000