Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Add back notification to neighbouring regions when RegionReadyModule is not ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -0/+3 | |
| | | | | | | | | active accidentally just removed in 528004d | |||||
| * | Perform other region ready actions even if simulator is configured to leave ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 2 | -20/+19 | |
| | | | | | | | | logins disabled on startup. | |||||
| * | Fix bug where region ready was being triggered twice in quick succession if ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -9/+12 | |
| | | | | | | | | a region contained no scripts. | |||||
| * | Establish EventManager.OnRegionReady event. This will only be triggerred ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 2 | -3/+35 | |
| | | | | | | | | | | | | once when the region is ready. Switch MapImageServiceModule to use this. | |||||
| * | Pass entire scene object in OnLoginsEnabled event rather than just the ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 2 | -5/+4 | |
| | | | | | | | | | | | | region name. This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed | |||||
| * | Merge branch 'master' of git://opensimulator.org/git/opensim | Dan Lake | 2012-07-18 | 2 | -24/+16 | |
| |\ | ||||||
| | * | Close() the ScenePresence after we've removed it from the scene graph, to ↵ | Justin Clark-Casey (justincc) | 2012-07-18 | 1 | -10/+16 | |
| | | | | | | | | | | | | cut down race conditions when another thread manages the grab the presence after some SP structures have been reset. | |||||
| * | | Missing parameter in log error message was throwing exception | Dan Lake | 2012-07-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'ubitwork' into avination | Melanie | 2012-07-17 | 4 | -51/+70 | |
|\ \ \ | ||||||
| * | | | minor changes, removed extra parts physics updates on linking nonroot | UbitUmarov | 2012-07-17 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | prims | |||||
| * | | | fix our stats ( old schema ) | UbitUmarov | 2012-07-17 | 2 | -48/+66 | |
| | | | | ||||||
| * | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 3 | -10/+4 | |
| |\ \ \ | ||||||
| * \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 1 | -14/+0 | |
| |\ \ \ \ | ||||||
| * \ \ \ \ | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-07-17 | 40 | -1280/+2632 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | remove forgotten line... | UbitUmarov | 2012-07-14 | 1 | -1/+0 | |
| | | | | | | | ||||||
| * | | | | | | don't subscribe collision events for nonphysical parts only because of | UbitUmarov | 2012-07-14 | 2 | -1/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | collision sounds. Let them be passive | |||||
* | | | | | | | Replace PollServiceRequestManager with older version, add extra logging to | Melanie | 2012-07-17 | 1 | -0/+1 | |
| |_|_|/ / / |/| | | | | | | | | | | | | | | | | | event exceptions to see call path leading up to it. | |||||
* | | | | | | Fix merge artefacts | Melanie | 2012-07-17 | 3 | -10/+4 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-07-16 | 1 | -14/+0 | |
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | ||||||
| * | | | Revert "Fix script "Running" behavior" | Melanie | 2012-07-16 | 1 | -14/+0 | |
| | |/ | |/| | | | | | | | | | | | | | A better solution using the already present flags must be found. This reverts commit 6d3ee8bb39d47ed7b32e8905fa0b2fc31c5a9f80. | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-07-16 | 3 | -4/+14 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | missed fix on vehicle reference frame | UbitUmarov | 2012-07-13 | 1 | -2/+1 | |
| | | | ||||||
| * | | Revert "Add instrumentation to log finalizer being called. Suppressed for ↵ | Melanie | 2012-07-12 | 2 | -12/+6 | |
| | | | | | | | | | | | | | | | | | | backup" This reverts commit ea91a36483f3eba90e16b664715d152f9eca2980. | |||||
| * | | Revert "Place instrumentation in the proper place. This needs reverting, too!" | Melanie | 2012-07-12 | 1 | -1/+1 | |
| | | | | | | | | | | | | This reverts commit d9b0b03aa3f92bcd860e4edb656cf6b1221776a6. | |||||
| * | | Add "gc collect" console command for debugging memleaks | Melanie | 2012-07-12 | 1 | -0/+7 | |
| | | | ||||||
| * | | Place instrumentation in the proper place. This needs reverting, too! | Melanie | 2012-07-11 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add instrumentation to log finalizer being called. Suppressed for backup | Melanie | 2012-07-11 | 2 | -6/+12 | |
| | | | | | | | | | | | | | | | interim copies to avoid spammage. Not for release to the grid, must be reverted first! | |||||
| * | | Change order of operations on backup to ensure keyframe motions are backed | Melanie | 2012-07-11 | 1 | -2/+6 | |
| | | | | | | | | | | | | up properly | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-13 | 2 | -7/+19 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | Don't cache regions data on the other unused LocalGridServiceConnector that ↵ | Justin Clark-Casey (justincc) | 2012-07-13 | 1 | -5/+17 | |
| | | | | | | | | | | | | | | | | | | the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector. Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages. | |||||
| * | | Change very recent AllowedViewerList and BannedViewerList config setting ↵ | Justin Clark-Casey (justincc) | 2012-07-12 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService] Also changes separator from comma to bar to match existing [LoginService] config features. Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-12 | 3 | -25/+97 | |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||||
| * | | Many explanitory comments added to the link and delink code in | Robert Adams | 2012-07-11 | 2 | -23/+93 | |
| | | | | | | | | | | | | SOG and SOP. Should have no functionality changes. | |||||
| * | | Add regression TestDetachScriptedAttachmentToInventory() | Justin Clark-Casey (justincc) | 2012-07-11 | 1 | -0/+4 | |
| | | | | | | | | | | | | This currently only does a relatively crude check for a ScriptState node in the serialized xml | |||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-07-11 | 4 | -33/+119 | |
|\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs | |||||
| * | | Melanie fix: detach SOGs from backup on linking | UbitUmarov | 2012-07-11 | 1 | -0/+2 | |
| | | | ||||||
| * | | let SOP AngularVelocity set physics actor angular velocity if it's | UbitUmarov | 2012-07-10 | 1 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | physical root prim and not a vehicle. With this llSetAngularVelocity should work and also llTargetOmega will do the same in this case. but for now this llTargetOmega is being a normal physical rotation with damping, and stops with selection. Thats not like SL apparently | |||||
| * | | more work on llSetAngularVelocity() | UbitUmarov | 2012-07-10 | 1 | -1/+28 | |
| | | | ||||||
| * | | Change semantics of FromXML on vehicle data to make the serializer a bit cleaner | Melanie | 2012-07-07 | 2 | -7/+19 | |
| | | | ||||||
| * | | fix vehicle to XML string | UbitUmarov | 2012-07-07 | 1 | -7/+13 | |
| | | | ||||||
| * | | Add saving vehicle physics data to the database | Melanie | 2012-07-07 | 3 | -25/+56 | |
| | | | ||||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-11 | 8 | -94/+325 | |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | If a part has a sit target and an avatar is already sitting, allow another ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -7/+4 | |
| | | | | | | | | | | | | | | | | | | | | | avatar to sit in the position given if no sit target was set. Previous behave was that the second avatar could not sit. This matches behaviour observed on the LL grid. | |||||
| * | | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -5/+6 | |
| | | | | | | | | | | | | and SOP.RemoveSittingAvatar() | |||||
| * | | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability" | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -8/+3 | |
| | | | | | | | | | | | | | | | This reverts commit c8f0d476d2f775ba4d7afca12eeff527b46bb8e2. On reconsideration, I think this is less readable since immediately following code still sets SitTargetAvatar directly | |||||
| * | | refactor: Add SOP.IsSitTargetOccupied to improve readability | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -3/+8 | |
| | | | ||||||
| * | | refactor: use sit orientation argument passed in to SP.SendSitResponse() ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -4/+2 | |
| | | | | | | | | | | | | | | | | | | rather than creating a new copy There are no issues with side-effects since this is a struct. | |||||
| * | | Move common code to detect whether a part has a valid sit target into a SOP ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -30/+20 | |
| | | | | | | | | | | | | | | | | | | | | | property rather than being repeated in SP. This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical. Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero. | |||||
| * | | Remove log line accidentally left in SP.SendSitResponse() | Justin Clark-Casey (justincc) | 2012-07-10 | 1 | -1/+1 | |
| | | | ||||||
| * | | Fix recent SOP.GetSittingAvatars() to return null if there are no sitting ↵ | Justin Clark-Casey (justincc) | 2012-07-10 | 2 | -6/+32 | |
| | | | | | | | | | | | | | | | | | | avatars rather than throwing an exception. Extends sitting avatar regression tests to test new sitters information |