aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2125-530/+1967
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Merge branch 'master' into careminsterMelanie2014-01-286-681/+883
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | |
| | * Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-241-21/+19
| | |\
| | | * minor: remove long unused state queue from "show queues" console reportsJustin Clark-Casey (justincc)2014-01-241-5/+3
| | | |
| | | * minor: correct the usage statement on the "show image queues" console ↵Justin Clark-Casey (justincc)2014-01-241-1/+1
| | | | | | | | | | | | | | | | command - should not have been "image queues show"
| | | * Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵Justin Clark-Casey (justincc)2014-01-241-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | from the "show queues" console report to stop screwing up formatting. "show pquques" already did this
| | * | rather than converting existing materials to assets, just retrieve them and ↵dahlia2014-01-201-32/+12
| | | | | | | | | | | | | | | | make them available for viewing. Any new materials added to the scene will become assets.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2014-01-203-3/+274
| | |\ \
| | | * | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-203-3/+274
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later.
| | * | | add null texture entry face check before converting legacy materialsdahlia2014-01-201-2/+2
| | |/ /
| | * | force SOG update when converting legacy materials to ensure changes are ↵dahlia2014-01-201-0/+2
| | | | | | | | | | | | | | | | persisted
| | * | delay texture entry parsing until absolutely necessary while converting ↵dahlia2014-01-201-4/+4
| | | | | | | | | | | | | | | | legacy materials
| | * | Add code to convert legacy materials stored in DynAttrs to new asset format ↵dahlia2014-01-201-20/+102
| | | | | | | | | | | | | | | | and store them as assets
| | * | Check agent permissions before modifying an object's materials. Also, when ↵Oren Hurvitz2014-01-201-10/+21
| | | | | | | | | | | | | | | | creating a Material asset, set the current agent as the Creator.
| | * | When asked to change the Material for one face, change only that face; not ↵Oren Hurvitz2014-01-201-18/+5
| | | | | | | | | | | | | | | | the default material
| | * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-201-327/+191
| | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
| | * | Renamed MaterialsDemoModule to MaterialsModuleOren Hurvitz2014-01-201-1/+1
| | | |
| | * | - Materials: support the viewer removing the material (in which case ↵Oren Hurvitz2014-01-201-35/+42
| | | | | | | | | | | | | | | | matsMap["Material"] is missing) - Reduced logging
| * | | Intermediate commit. Sill errors.Melanie2014-01-053-15/+74
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-191-3/+62
| | |\ \ | | | |/
| | | * Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵Justin Clark-Casey (justincc)2013-12-181-3/+62
| | | | | | | | | | | | | | | | sending
| | * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-3/+5
| | |\ \ | | | |/
| | | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented
| | * | Comment out sit position checks in TestSitAndStandWithSitTarget() in SP and ↵Justin Clark-Casey (justincc)2013-12-141-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | NPC tests until positions are known to be stable. Also resolve issues with NoSitTarget() tests where I was trying to use a destroyed PhysActor
| | * | Fix TestSitAndStandWithNoSitTarget NPC and SP tests.Justin Clark-Casey (justincc)2013-12-141-6/+2
| | | | | | | | | | | | | | | | | | | | These stopped working because current code calculates sit heights based on avatar physics rather than appearance data. Also changed BasicPhysics to not divide Z param of all set sizes by 2 - there's no obvious good reason for this and basicphysics is only used in tests
| | * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-112-1/+3
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements
| * | Merge branch 'master' into careminsterMelanie2013-12-071-2/+4
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| | * Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages isMic Bowman2013-11-271-2/+4
| | | | | | | | | | | | | | | | | | the RegionReady module to be warn so that the message will show up in the log for simulators running in a more production mode (knowing when logins are functional is useful).
| * | Merge branch 'master' into careminsterMelanie2013-11-234-11/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| | * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-154-11/+9
| | | | | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
| * | Merge branch 'master' into careminsterMelanie2013-11-031-50/+122
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Added support for attachments to group notices when using Flotsam groups.Kevin Cozens2013-10-151-50/+122
| | |
| * | Merge branch 'master' into careminsterMelanie2013-10-062-7/+22
| |\ \ | | |/ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| | |
| | * Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow ↵Justin Clark-Casey (justincc)2013-10-041-6/+21
| | | | | | | | | | | | | | | | | | region modules to directly subscribe to chat and messages received by NPCs Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
| * | Merge branch 'master' into careminsterMelanie2013-10-043-19/+338
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-272-2/+2
| | | | | | | | | | | | the code that this is symmetric with CloseAgent()
| | * refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| | * minor: Stop debug logging whenever an npc is moved, other npc log related ↵Justin Clark-Casey (justincc)2013-09-191-16/+15
| | | | | | | | | | | | formatting cleanups
| | * BulletSim: add LSL function and plumbing for setting a springRobert Adams2013-09-111-1/+3
| | | | | | | | | | | | equilibrium point in the physics engine constraint.
| | * BulletSim: add extended physics LSL constants for axis specification.Robert Adams2013-09-111-2/+14
| | | | | | | | | | | | | | | Add specific error warnings for mis-matched parameter types in extended physics functions.
| | * BulletSim: ability to specify groups of axis to modify in constraint ↵Robert Adams2013-09-111-1/+11
| | | | | | | | | | | | parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter.
| | * BulletSim: add axis parameter for specifying enable, damping, and stiffness ↵Robert Adams2013-09-111-4/+6
| | | | | | | | | | | | for spring constraints. Renumber parameter ops since I can as no one is using them yet.
| | * BulletSim: implementation of setting spring specific physical parameters. ↵Robert Adams2013-09-111-1/+5
| | | | | | | | | | | | Add setting of linkset type to physChangeLinkParams. Lots of detail logging for setting of linkset constraint parameters.
| | * BulletSim: pass both root and child BSPhysObjects to Extension function. ↵Robert Adams2013-09-111-13/+17
| | | | | | | | | | | | Update routines to use the new parameters list from above change.
| | * BulletSim: Extension parameters passed through the classes made to pass just ↵Robert Adams2013-09-111-5/+18
| | | | | | | | | | | | and array of objects rather than a mixture of parameters and array. Makes understanding and parsing what is being passed much easier.
| | * BulletSim: add extended physics function physGetLinkType(linkNum). Add ↵Robert Adams2013-09-111-0/+19
| | | | | | | | | | | | implementation of physChangeLinkParams() in BSLinksetConstraint.
| | * BulletSim: change ExtendedPhysics constants to 'const' so they can be used ↵Robert Adams2013-09-111-28/+28
| | | | | | | | | | | | as case variables in switch statements.
| | * BulletSim: add physChangeLinkParams to set individual parameters on link ↵Robert Adams2013-09-111-94/+171
| | | | | | | | | | | | constraints. Not fully functional. Remove double definition of ExtendedPhysics parameters by having BulletSim reference the optional module (addition to prebuild.xml and usings).
generated by cgit v1.1 at 2024-10-20 08:04:32 +0000