aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-03-251-2/+2
|\
| * Get the full viewer name even if it's (incorrectly) sent in the 'Channel' fieldOren Hurvitz2014-03-241-2/+2
| | | | | | | | | | | | Recent versions of Firestorm and Singularity have started sending the viewer name in the 'Channel' field, leaving only their version number in the 'Viewer' field. So we need to search both of these fields for the viewer name. This resolves http://opensimulator.org/mantis/view.php?id=6952
* | Don't fail to enable permissions modules correctly if there is any leading ↵Justin Clark-Casey (justincc)2014-03-251-2/+3
|/ | | | or trailing whitespace between comma separate module combinations.
* When sending group notices through group messaging, allow the agent ID to ↵Justin Clark-Casey (justincc)2014-03-122-6/+6
| | | | | | | | use for fetching group data to be different from im.fromAgentID This is because xmlrpcgroups currently always checks visibility for the requesting agent ID (unlike Groups v2, which can accept UUID.Zero) But group notice IMs have a from agent which is the group rather than the sending agent. Further addresses http://opensimulator.org/mantis/view.php?id=7037
* Send group notices through the same messaging module mechanism used to send ↵Justin Clark-Casey (justincc)2014-03-113-91/+151
| | | | | | | | group chat to avoid timeout issues when sending messages to large groups. Only implementing for XmlRpcGroups initially to test. May require MessageOnlineUsersOnly = true in [Groups] to be effective. In relation to http://opensimulator.org/mantis/view.php?id=7037
* Add regression test for sending group notices via xmlrpc groups connector.Justin Clark-Casey (justincc)2014-03-072-0/+56
|
* Rewrite of mega-region code to use new form of border checking.Robert Adams2014-02-151-31/+0
| | | | | | | This commit eliminates all of the 'border' class and list code and replaces it with testing if in the current region. Impacts: can make a mega-region out of varregions of the same size; and mega-region combinations must be rectangular (not square but rectangular)
* Log information about which function, request data and agent ID triggered an ↵Justin Clark-Casey (justincc)2014-02-141-14/+5
| | | | XmlRpcGroupsServiceConnector error
* Add JsonRezAtRoot script function. Operation is very similar toMic Bowman2014-02-091-0/+111
| | | | | | | llRezAtRoot except that the start parameter is a Json string that will be unpacked into a json store identified by the objects uuid. This makes a much more expressive (and simpler) way of passing initial parameters to a rezzed object.
* Overload INPCModule.CreateNPC() to allow agentID to be specified. Note: this ↵dahlia2014-02-012-3/+38
| | | | is intended for use in region modules and is not exposed to scripts.
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-311-1/+1
|\
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-311-1/+1
| |
* | Merge branch 'master' into varregionRobert Adams2014-01-281-3/+1
|\ \
| * | Re-enabled NPCModuleTests.TestCreate()Justin Clark-Casey (justincc)2014-01-271-3/+1
| | |
* | | Merge branch 'master' into varregionRobert Adams2014-01-261-21/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
| * | 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
* | | Merge branch 'master' into varregionRobert Adams2014-01-215-660/+864
|\ \ \ | |/ /
| * | 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
* | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-263-1/+5
| | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | Merge branch 'master' into varregionRobert Adams2013-12-201-3/+62
|\ \ \ | |/ /
| * | 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 'master' into varregionRobert Adams2013-12-173-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-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
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-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 varregionRobert Adams2013-12-011-2/+4
|\ \ | |/
| * 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 varregionRobert Adams2013-11-154-11/+9
|\ \ | |/
| * 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
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-082-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 varregionRobert Adams2013-10-161-50/+122
|\ \ | |/
| * Added support for attachments to group notices when using Flotsam groups.Kevin Cozens2013-10-151-50/+122
| |