Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+24 |
|\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | ||||
| * | Added EventManager.OnRegionStarted which is triggered when Heartbeat is started. | Dan Lake | 2012-01-04 | 1 | -0/+24 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2011-12-18 | 1 | -0/+6 |
|\ \ | |/ | |||||
| * | Don't pass on ChaneWaterHeight event from EventManager is new water height ↵ | Justin Clark-Casey (justincc) | 2011-12-16 | 1 | -0/+6 |
| | | | | | | | | | | | | | | is less than 0 This is to stop bad values and subsequent viewer crashes. Thanks to Michelle Argus for this patch. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-19 | 1 | -10/+16 |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | If the entire simulator is shutting down then don't bother to unload the ↵ | Justin Clark-Casey (justincc) | 2011-11-17 | 1 | -10/+16 |
| | | | | | | | | | | | | | | scripts from the appdomain in XEngine. All the other actions (script state save, etc.) still occur. This makes shutdown where there are many scripts vastly quicker. | ||||
* | | Merge branch 'master' into bigmerge | Melanie | 2011-11-17 | 1 | -8/+15 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs | ||||
| * | Add comments about trying to avoid synchronous work off the ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -4/+9 |
| | | | | | | | | EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another. | ||||
| * | For clients that are entering a simulator from initial login, stop executing ↵ | Justin Clark-Casey (justincc) | 2011-11-15 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | FriendsModule.FetchFriendslist() asychronously. Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated. Changing this to synchronous may improve issues where a user does not see friends as online even though they are. I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient. | ||||
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -6/+5 |
|\ \ | |/ | |||||
| * | Do a partial fix/implementation of OSSL osNpcMoveTo() | Justin Clark-Casey (justincc) | 2011-08-03 | 1 | -6/+5 |
| | | | | | | | | | | | | Avatar moves and stops. However, will stop in mid stride. And if the move to position is in the air, avatar will continue to make vain and quite hilarious attempts to take off (but never doing so). Clearly more work is needed. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -0/+48 |
|\ \ | |/ | |||||
| * | Added EventManager.OnPrimsLoaded, an event that modules can hook up onto so ↵ | Diva Canto | 2011-06-08 | 1 | -0/+24 |
| | | | | | | | | that they know when the scene's objects have been loaded from the DB. | ||||
| * | Adding an event to signal that logins are enabled | BlueWall | 2011-05-28 | 1 | -0/+24 |
| | | | | | | | | Added an event to signal the eabling of logins and added an alert to send to a configured service. | ||||
| * | Add an event for an orderly region shutdown that fires once per region before | Melanie | 2011-05-24 | 1 | -0/+25 |
| | | | | | | | | the SceneGraph is torn down. | ||||
* | | Add an event for an orderly region shutdown that fires once per region before | Melanie | 2011-05-24 | 1 | -0/+25 |
| | | | | | | | | the SceneGraph is torn down. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 1 | -0/+30 |
|\ \ | |/ | |||||
| * | Add generic EventManager.OnObjectAddedToScene and get PrimCountModule to ↵ | Justin Clark-Casey (justincc) | 2011-03-23 | 1 | -0/+30 |
| | | | | | | | | | | | | | | listen for that rather than EventManager.OnParcelPrimCountAdd OnParcelPrimCountAdd had the wrong semantics for the PrimCountModule - it was invoked for every entity in the scene, not just new ones, which would screw up the untainted count. Extend automated test for this scenario. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Formatting cleanup. | Jeff Ames | 2010-10-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 1 | -0/+35 |
|\ \ | |/ | |||||
| * | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+35 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 1 | -8/+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. | ||||
| * | Merged | John Hurliman | 2010-09-12 | 1 | -6/+6 |
| |\ | |||||
| | * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -6/+6 |
| | | | |||||
| * | | * Added ISimulationDataService and IEstateDataService | John Hurliman | 2010-09-12 | 1 | -2/+2 |
| |/ | | | | | | | | | * Removed StorageManager * CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings | ||||
| * | Fixed the naming mess around data connectors for simulation data | John Hurliman | 2010-09-11 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -2/+2 |
|\ \ | |/ | |||||
| * | Add test to check persistence of newly added pre-linked objects | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -2/+2 |
| | | | | | | | | | | Added a MockRegionDataPlugin to do in-memory persistence for tests since adding this to OpenSim.Data.Null.NullDataStore doesn't seem appropriate NullDataStore can do nothing because OpenSim only ever retrieve region objects from the database on startup. Adding an in-memory store here would be unecessary overhead. | ||||
| * | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -1/+25 |
| | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
* | | Reflect the ParcelPropertiesUpdateRequest into Scene.EventManager, because | Melanie Thielker | 2010-09-06 | 1 | -1/+25 |
| | | | | | | | | modules need to see it (Search!) even if it comes in via CAPS | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-06 | 1 | -3/+94 |
|\ \ | |/ | |||||
| * | add userExposed parameter to part copy event | Justin Clark-Casey (justincc) | 2010-07-28 | 1 | -3/+6 |
| | | |||||
| * | relocate moap specific cloning code to MoapModule | Justin Clark-Casey (justincc) | 2010-07-28 | 1 | -1/+28 |
| | | |||||
| * | Add EventManager.OnSceneObjectPreSave() for future use. This is triggered ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -3/+36 |
| | | | | | | | | immediately before a copy of the group is persisted to storage | ||||
| * | Add EventManager.OnSceneObjectLoaded() for future use. This is fired ↵ | Justin Clark-Casey (justincc) | 2010-07-26 | 1 | -2/+30 |
| | | | | | | | | immediately after a scene object is loaded from storage. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-07-11 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | Remove localID from script controls data. It won't transfer to another | Melanie | 2010-07-11 | 1 | -3/+3 |
| | | | | | | | | region anyway | ||||
| * | Committing the LightShare code, which was developed by TomMeta of Meta7. | Melanie | 2010-03-31 | 1 | -1/+23 |
| | | | | | | | | | | This allows scripts to set WindLight parameters for clients connecting to a region. Currently, this is only supported by the Meta7 viewer. | ||||
* | | Add a new global event : OnTerrainUpdate | Tom Grimshaw | 2010-06-26 | 1 | -0/+24 |
| | | |||||
* | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-15 | 1 | -4/+4 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright notices. | Jeff Ames | 2010-03-10 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-06 | 1 | -15/+15 |
|\ \ | |/ | |||||
| * | move linden notecard parsing from LSL_Api.cs to SLUtil so that region ↵ | Justin Clark-Casey (justincc) | 2010-03-04 | 1 | -15/+15 |
| | | | | | | | | modules can use it | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-03 | 1 | -87/+112 |
|\ \ | |/ | | | | | This brings careminster on the level of master. To be tested | ||||
| * | Initial Online friends notification seems to be working reliably now. All ↵ | Diva Canto | 2010-02-28 | 1 | -1/+26 |
| | | | | | | | | this needs more testing, but everything is there. | ||||
| * | Formatting cleanup. | Jeff Ames | 2010-02-15 | 1 | -86/+86 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 1 | -1/+28 |
|\ \ | |/ | |||||
| * | Add EventManager.OnIncomingSceneObject event which is triggered by an ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -1/+28 |
| | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence |