Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into varregion | Robert Adams | 2014-01-21 | 5 | -660/+864 |
|\ | |||||
| * | rather than converting existing materials to assets, just retrieve them and ↵ | dahlia | 2014-01-20 | 1 | -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/opensim | dahlia | 2014-01-20 | 3 | -3/+274 |
| |\ | |||||
| | * | Clean up orphaned json stores. This can happen when an object is | Mic Bowman | 2014-01-20 | 3 | -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 materials | dahlia | 2014-01-20 | 1 | -2/+2 |
| |/ | |||||
| * | force SOG update when converting legacy materials to ensure changes are ↵ | dahlia | 2014-01-20 | 1 | -0/+2 |
| | | | | | | | | persisted | ||||
| * | delay texture entry parsing until absolutely necessary while converting ↵ | dahlia | 2014-01-20 | 1 | -4/+4 |
| | | | | | | | | legacy materials | ||||
| * | Add code to convert legacy materials stored in DynAttrs to new asset format ↵ | dahlia | 2014-01-20 | 1 | -20/+102 |
| | | | | | | | | and store them as assets | ||||
| * | Check agent permissions before modifying an object's materials. Also, when ↵ | Oren Hurvitz | 2014-01-20 | 1 | -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 Hurvitz | 2014-01-20 | 1 | -18/+5 |
| | | | | | | | | the default material | ||||
| * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 1 | -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 MaterialsModule | Oren Hurvitz | 2014-01-20 | 1 | -1/+1 |
| | | |||||
| * | - Materials: support the viewer removing the material (in which case ↵ | Oren Hurvitz | 2014-01-20 | 1 | -35/+42 |
| | | | | | | | | matsMap["Material"] is missing) - Reduced logging | ||||
* | | varregion: many more updates removing the constant RegionSize and replacing | Robert Adams | 2013-12-26 | 3 | -1/+5 |
| | | | | | | | | with a passed region size. This time in the map code and grid services code. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-12-20 | 1 | -3/+62 |
|\ \ | |/ | |||||
| * | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-19 | 1 | -3/+62 |
| |\ | |||||
| | * | Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵ | Justin Clark-Casey (justincc) | 2013-12-18 | 1 | -3/+62 |
| | | | | | | | | | | | | sending | ||||
* | | | Merge branch 'master' into varregion | Robert Adams | 2013-12-17 | 3 | -13/+15 |
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Add new region crossing code to varregion Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 |
| |\ \ | | |/ | |||||
| | * | After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -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-14 | 1 | -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-14 | 1 | -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 code | Melanie | 2013-12-11 | 2 | -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 | ||||
* | | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. | Robert Adams | 2013-12-14 | 1 | -2/+2 |
| | | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-12-01 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Change the log level for the LOGIN DISABLED and LOGIN ENABLED messages is | Mic Bowman | 2013-11-27 | 1 | -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 varregion | Robert Adams | 2013-11-15 | 4 | -11/+9 |
|\ \ | |/ | |||||
| * | refactor: replace verbose checks with String.IsNullOrEmpty where applicable. | Justin Clark-Casey (justincc) | 2013-11-15 | 4 | -11/+9 |
| | | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845 | ||||
* | | varregion: elimination of Constants.RegionSize from all over OpenSimulator. | Robert Adams | 2013-11-08 | 2 | -3/+6 |
| | | | | | | | | | | | | | | Routines in Util to compute region world coordinates from region coordinates as well as the conversion to and from region handles. These routines have replaced a lot of math scattered throughout the simulator. Should be no functional changes. | ||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-10-16 | 1 | -50/+122 |
|\ \ | |/ | |||||
| * | Added support for attachments to group notices when using Flotsam groups. | Kevin Cozens | 2013-10-15 | 1 | -50/+122 |
| | | |||||
* | | Merge branch 'master' into varregion | Robert Adams | 2013-10-07 | 2 | -7/+22 |
|\ \ | |/ | |||||
| * | Bump OPenSimulator version and assembly versions up to 0.8.0 Dev | Justin Clark-Casey (justincc) | 2013-10-04 | 1 | -1/+1 |
| | | |||||
| * | Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow ↵ | Justin Clark-Casey (justincc) | 2013-10-04 | 1 | -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. | ||||
* | | VarRegion: change RegionInfo storage of region coordinates from region | Robert Adams | 2013-09-28 | 1 | -2/+2 |
|/ | | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages. | ||||
* | refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵ | Justin Clark-Casey (justincc) | 2013-09-27 | 2 | -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-27 | 1 | -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-19 | 1 | -16/+15 |
| | | | | formatting cleanups | ||||
* | BulletSim: add LSL function and plumbing for setting a spring | Robert Adams | 2013-09-11 | 1 | -1/+3 |
| | | | | equilibrium point in the physics engine constraint. | ||||
* | BulletSim: add extended physics LSL constants for axis specification. | Robert Adams | 2013-09-11 | 1 | -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 Adams | 2013-09-11 | 1 | -1/+11 |
| | | | | parameters that control multiple axis. Add useLinearReferenceFrameA constraint parameter. | ||||
* | BulletSim: add axis parameter for specifying enable, damping, and stiffness ↵ | Robert Adams | 2013-09-11 | 1 | -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 Adams | 2013-09-11 | 1 | -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 Adams | 2013-09-11 | 1 | -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 Adams | 2013-09-11 | 1 | -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 Adams | 2013-09-11 | 1 | -0/+19 |
| | | | | implementation of physChangeLinkParams() in BSLinksetConstraint. | ||||
* | BulletSim: change ExtendedPhysics constants to 'const' so they can be used ↵ | Robert Adams | 2013-09-11 | 1 | -28/+28 |
| | | | | as case variables in switch statements. | ||||
* | BulletSim: add physChangeLinkParams to set individual parameters on link ↵ | Robert Adams | 2013-09-11 | 1 | -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). | ||||
* | BulletSim: add physChangeLinkSpring to change linkset link to be a spring ↵ | Robert Adams | 2013-09-11 | 1 | -3/+70 |
| | | | | constraint. Add implementation to create spring constraint. Send up property updates for linkset children at the end of flexible linkset links. The simulator probably doesn't do the right thing yet. | ||||
* | BulletSim: initial implementation of physChangeLinkFixed that resets a ↵ | Robert Adams | 2013-09-11 | 1 | -1/+81 |
| | | | | linkset's link back to a fixed, non-moving connection. |