aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* Set up a StreamReader and call ReadToEnd() instead of using the ↵Justin Clark-Casey (justincc)2014-02-271-41/+13
| | | | | | GetStreamString() extension method This eliminates some stream seeking that was never necessary and makes disposable of the StreamReader consistent with other code
* Remove long unused UntrustedWebRequest classJustin Clark-Casey (justincc)2014-02-271-230/+0
| | | | This purports to check web requests but doesn't appear to actually do that.
* refactor: More consistently use using construct within WebUtil to match ↵Justin Clark-Casey (justincc)2014-02-271-225/+218
| | | | other existing code there.
* Add more details to InvalidOperationException logging in ↵Justin Clark-Casey (justincc)2014-02-271-3/+4
| | | | SychronousRestFormsRequest.MakeRequest().
* Add Util method to load OpSys env varsDev Random2014-02-261-83/+87
|
* Log information about which function, request data and agent ID triggered an ↵Justin Clark-Casey (justincc)2014-02-141-0/+24
| | | | XmlRpcGroupsServiceConnector error
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-311-3/+3
|\
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-311-3/+3
| |
* | clear land tainting when tested. Then testing, pass scene to LandObject as ↵Robert Adams2014-01-281-1/+5
| | | | | | | | now needed to get region size
* | Fix terrain tests by properly initializing low detail terrain to zero height.Robert Adams2014-01-281-0/+1
| | | | | | | | Also remove PI heightmap test as new heightmaps only have two significant digits.
* | varregion: enable teleporting to a varregion by clicking on the map andRobert Adams2014-01-262-0/+51
| | | | | | | | | | | | | | pressing the 'teleport' button. This commit adds returning region map info for all the subregions of a varregion. This also handles the selection of the extra region and then the displacement of the postion so the teleport is to the correct location.
* | Merge branch 'master' into varregionRobert Adams2014-01-213-21/+43
|\ \
| * \ Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-201-14/+7
| |\ \ | | |/
| | * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-201-14/+7
| | | | | | | | | | | | been deleted or has no spawn points.
| * | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵Oren Hurvitz2014-01-202-7/+36
| | | | | | | | | | | | | | | | | | "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'.
* | | Merge branch 'master' into varregionRobert Adams2014-01-191-1/+25
|\ \ \ | |/ /
| * | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | |
| * | minor: Add method doc to IImproveAssetCacheJustin Clark-Casey (justincc)2014-01-181-1/+25
| | |
* | | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | |
* | | Merge branch 'master' into varregionRobert Adams2014-01-112-1/+90
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneBase.cs OpenSim/Services/Interfaces/IGridService.cs OpenSim/Services/LLLoginService/LLLoginResponse.cs (conflicts were debug statements that are commented out in master branch)
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-111-1/+3
| |\ \ | | |/
| | * Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that.Oren Hurvitz2014-01-111-1/+3
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-101-0/+87
| |\ \ | | |/
| | * Refactored: use a single function to apply an object's folded permissions to ↵Oren Hurvitz2014-01-101-0/+19
| | | | | | | | | | | | its main permissions
| | * Refactored setting permissions when rezzing items: use the same function ↵Oren Hurvitz2014-01-101-0/+68
| | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.)
| | * Add missing viewer param elements for butt and breast physics.Justin Clark-Casey (justincc)2013-12-191-1/+75
| | | | | | | | | | | | | | | Patch from http://opensimulator.org/mantis/view.php?id=6864 except with tabs replaced by spaces Thanks cinderblocks!
| * | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs
| * | Add routines in Util.cs for conversion of region handles to regionRobert Adams2014-01-042-1/+47
| | | | | | | | | | | | | | | | | | locations and for the conversion of region world location to region 'region' location. These routines will replace all the arithmatic scattered throughout OpenSimulator.
| * | Add serialization/deserialization of region size to RegionInfo, GridRegion, ↵Robert Adams2013-12-282-37/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | and RegionData. This does not modify interfaces or handling of variable sized regions. This only enables the loading and storing of the region size and the reporting of the region size in grid service responses. The database tables already have the code to load and store the region size.
* | | varregion: Add region size to teleport event messages (EnableSimulator,Robert Adams2014-01-032-1/+5
| | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen).
* | | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-261-0/+5
| | | | | | | | | | | | with a passed region size. This time in the map code and grid services code.
* | | Merge branch 'master' into varregionRobert Adams2013-12-179-115/+419
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | 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-15/+15
| |\ \ | | |/
| | * ParseNotecardToList() returned data past end of notecard text (mantis #6881).Kevin Cozens2013-12-141-15/+15
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2013-12-141-2/+2
| |\ \ | | |/
| | * After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵Justin Clark-Casey (justincc)2013-12-141-2/+2
| | | | | | | | | | | | | | | | | | | | | 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
| * | Add missing files *blush*Melanie2013-12-111-0/+157
| | |
| * | Committing the Avination Scene Presence and related texture codeMelanie2013-12-115-98/+237
| |/ | | | | | | | | | | | | | | | | - 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
| * Add support for user preferences (im via email)BlueWall2013-12-061-0/+8
| |
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-46/+22
| | | | | | | | | | | | 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.
* | varregion: Add MaxRegionSize constant and enforce in RegionInfo.Robert Adams2013-11-302-2/+13
| | | | | | | | | | Intermediate checkin of changing border cross computation from checking boundry limits to requests to GridService. Not totally functional.
* | varregion: many replacements of in-place arithmetic with calls toRobert Adams2013-11-281-0/+1
| | | | | | | | | | the Util functions for converting world addresses to region addresses and converting region handles to locations.
* | Merge branch 'master' into varregionRobert Adams2013-11-241-1/+25
|\ \ | |/
| * rename private field ACD.ViewerInternal to m_viewerInternal in line with ↵Justin Clark-Casey (justincc)2013-11-191-5/+6
| | | | | | | | conventions used elsewhere in code
| * Stop AgentCircuitData.Viewer.get() from throwing an error if no Viewer has ↵Justin Clark-Casey (justincc)2013-11-191-1/+1
| | | | | | | | | | | | been set. Continue to return null instead.
| * Normalize viewer version string to accomodate new style version reporting in ↵Latif Khalifa2013-11-191-1/+24
| | | | | | | | the viewers
* | Merge branch 'master' into varregionRobert Adams2013-11-157-9/+9
|\ \ | |/
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-157-9/+9
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | varregion: fix GetLandObject error return and initialization of squareRobert Adams2013-11-101-2/+4
| | | | | | | | | | | | land object bitmaps. This fixes creation of child presences and the editing of parcels. Also lots of commented out debugging messages.
* | varregion: elimination of Constants.RegionSize from all over OpenSimulator.Robert Adams2013-11-083-7/+48
| | | | | | | | | | | | | | 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.