aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/Scripting (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-181-2/+4
|\ | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Remove some debugging output form the loggerBlueWall2012-02-161-2/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-01-211-1/+5
|\ \ | |/
| * RegionReady:BlueWall2012-01-181-1/+5
| | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2012-01-161-2/+5
|\ \ | |/
| * protect the region ready alerts for loading oarfiles if no post URI is setMic Bowman2012-01-141-2/+5
| |
* | Merge branch 'master' into careminsterMelanie2012-01-141-6/+51
|\ \ | |/ | | | | | | | | | | | | 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
| * Update RegionReadyModuleBlueWall2012-01-131-6/+51
| | | | | | | | Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
* | Merge branch 'master' into careminsterMelanie2012-01-061-3/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move simulator asset info commands to an optional module from the connector. ↵Justin Clark-Casey (justincc)2012-01-051-3/+2
| | | | | | | | | | | | Make them conform with service side commands. This stops them appearing twice when Hypergrid is enabled.
| * Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-5/+5
| |
* | Fix CHANGED_TEXTURE and CHANGED_COLOR.Melanie2011-12-051-5/+5
| |
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-251-1/+1
|\ \ | |/
| * Get OdeScene to use passed in time step rather than hard-coded 0.089Justin Clark-Casey (justincc)2011-10-201-1/+1
| | | | | | | | However, I still don't recommend changing MinFrameTime from 0.089, high values do not work well and lower values don't seem to make much difference
* | Resolve merge commits, stage 1Tom2011-09-042-2/+7
|\ \ | |/
| * Add "shutdown" message to RegionReadyBlueWall2011-08-151-0/+5
| | | | | | | | | | | | Add "shutdown" message when removing region. From a patch submitted by Michelle Argus. Thanks Michelle
| * refactor: Move all callers of the obsoleted ↵Justin Clark-Casey (justincc)2011-07-131-2/+2
| | | | | | | | SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-1/+1
|\ \ | |/
| * Rename SetSculptData() to SetSculptProperties(), since this is what it does ↵Justin Clark-Casey (justincc)2011-07-091-1/+1
| | | | | | | | (setting SculptData is done through the property)
* | Merge branch 'master' into careminster-presence-refactorroot2011-06-301-0/+2
|\ \ | |/
| * RegionReady Module:BlueWall2011-06-241-0/+2
| | | | | | | | Add notification to neighbors when logins are enabled.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-2/+90
|\ \ | |/
| * Adding an event to signal that logins are enabledBlueWall2011-05-281-11/+76
| | | | | | | | Added an event to signal the eabling of logins and added an alert to send to a configured service.
| * Add option to disable loginsBlueWall2011-05-281-1/+24
| | | | | | | | This just covers script loading for now. More to come.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-031-9/+1
|\ \ | |/
| * Comment out some startup logging lines to make up for the one I added ↵Justin Clark-Casey (justincc)2011-04-021-9/+1
| | | | | | | | | | | | earlier on. Most of these are where the region modules are telling us they are disabled. Convention is only to log when enabled (even that is really noisy)
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-011-0/+1
|\ \ | |/
| * Start using IPrimCounts populated by PrimCountModule instead of LandData ↵Justin Clark-Casey (justincc)2011-03-251-0/+1
| | | | | | | | | | | | | | counts populated by LandManagementModule. In order to pass ILandObject into IClientAPI.SendLandProperties(), had to push ILandObject and IPrimCounts into OpenSim.Framework from OpenSim.Region.Framework.Interfaces, in order to avoid ci Counts are showing odd behaviour at the moment, this will be addressed shortly.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-291-9/+6
|\ \ | |/
| * Merge branch 'opensim-master' into dev-appearanceMaster ScienceSim2010-10-282-9/+5
| |\
| * | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-9/+6
| | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-292-2/+1
|\ \ \ | | |/ | |/|
| * | Formatting cleanup.Jeff Ames2010-10-282-2/+1
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-271-7/+4
|\ \ \ | |/ /
| * | Formatting cleanup.Jeff Ames2010-10-271-7/+4
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-5/+1
|\ \ | |/ | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * Changed SceneObjectGroup to store parts with the fast and thread-safe ↵John Hurliman2010-09-161-5/+1
| | | | | | | | MapAndArray collection
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-133-6/+8
|\ \ | |/ | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on.
| * Formatting cleanup.Jeff Ames2010-09-121-2/+2
| |
| * First pass at cleaning up thread safety in EntityManager and SceneGraphJohn Hurliman2010-09-102-4/+6
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-071-1/+1
|\ \ | |/
| * Make console backup command do a forced backup rather than non-forcedJustin Clark-Casey (justincc)2010-09-061-1/+1
| | | | | | | | Remove no-arg backup method for simplicity as it only make sense to call non-forced backup internally
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-10/+12
|\ \ | |/
| * Improve liveness by operating on list copies of SOG.Children where appropriateJustin Clark-Casey (justincc)2010-08-281-10/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-261-7/+12
|\ \ | |/ | | | | This was rather conflicted. Please test linking.
| * Improve consistency of locking for SOG.m_parts in order to avoid race ↵Justin Clark-Casey (justincc)2010-08-261-7/+12
| | | | | | | | conditions in linking and unlinking
| * Fix a nullref in EventManager caused by RegionReady not setting the sceneMelanie Thielker2010-05-301-0/+1
| |
* | Fix the XmlRpcRouterModule so it reads from the correct config section ↵Tom2010-08-011-2/+2
| | | | | | | | ([XMLRPC] not [Startup]) and disable by default (since it's disabled in the ini by default)
* | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the ↵Tom2010-08-011-2/+10
| | | | | | | | xmlrpc_uri event if it's not mentioned in the ini.
* | Fix a nullref in EventManager caused by RegionReady not setting the sceneMelanie Thielker2010-05-311-0/+1
|/
generated by cgit v1.1 at 2024-12-18 07:13:32 +0000