aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into varregionRobert Adams2014-01-265-109/+136
|\ | | | | | | | | | | | | 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 'justincc-master'Justin Clark-Casey (justincc)2014-01-244-320/+362
| |\ \ | | |/
| | * Properly dispose of drawing objects to reduce/stop memory leakage on ↵Justin Clark-Casey (justincc)2014-01-244-319/+343
| | | | | | | | | | | | generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
| | * Add "generate map" console command to allow manual regeneration and storage ↵Justin Clark-Casey (justincc)2014-01-232-1/+19
| | | | | | | | | | | | | | | | | | of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile
* | | varregion: modify MapImageModule structure so it will better mergeRobert Adams2014-01-261-263/+271
| | | | | | | | | | | | with changes made in master.
* | | varregion: pass region size in more HG services.Robert Adams2014-01-243-1/+17
| | |
* | | Enable the simulator to handle region size information returned fromMic Bowman2014-01-231-0/+12
| | | | | | | | | | | | | | | a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side will be updated separately.
* | | Merge branch 'master' into varregionRobert Adams2014-01-2125-761/+1195
|\ \ \ | |/ /
| * | Adds a configuration option to cannibalize bandwidth from theMic Bowman2014-01-202-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | udp texture throttle and move it to the task throttle. Since most viewers are using http textures, the udp texture throttle is holding onto bw that could be used for more responsive prims updates. See the documentation for CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default.
| * | Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵dahlia2014-01-201-0/+73
| | | | | | | | | | | | DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented
| * | 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-2011-43/+467
| |\ \
| | * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2014-01-204-3/+281
| | |\ \
| | | * | Clean up orphaned json stores. This can happen when an object isMic Bowman2014-01-204-3/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-207-40/+186
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | | * Stop exceptions being generated on agent connection if a telehub object has ↵Justin Clark-Casey (justincc)2014-01-207-40/+186
| | | | | | | | | | | | | | | | been deleted or has no spawn points.
| * | | 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-2011-453/+301
| | | | | | | | | | | | | | | | | | "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: remove debugging splat file saving that fills up theRobert Adams2014-01-191-4/+0
| | | | | | | | | | | | maptile dir and causes errors.
* | | varregion: remove --noterrain and --noparcel parameters in 'load oar'.Robert Adams2014-01-193-21/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add --forceterrain and --forceparcel to 'load oar'. In order to not change the operation of --merge (which does an object merge and suppresses terrain and parcel information loading), added the --force* parameters to be used when loading multiple oars to build up a varregion. Added --rotation and --rotationcenter parameters to 'load oar' which apply a rotation to the loaded oar objects before displacing. The rotation is in degrees (pos or neg) and the center defaults to "<128, 128, 0>".
* | | varregion: add --noterrain and --noparcel to 'load oar'.Robert Adams2014-01-196-46/+70
| | | | | | | | | | | | | | | --noterrain suppresses the loading of the terrain from the oar. --noparcels suppresses the loading of parcel information from the oar.
* | | varregion: add --displacement parameter to 'load oar'.Robert Adams2014-01-198-20/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | Adds displacment to all objects and terrain loaded from the oar. As an example, if you have a 512x512 region and an old 256x256 oar, doing load oar --displacement "<128,128,0>" oarFile.oar will load the object (and terrain) into the middle of the 512x512 region. If displacement is not specified, 'load oar' works like it always has. If you have a 5
* | | Merge branch 'master' into varregionRobert Adams2014-01-1921-343/+312
|\ \ \ | |/ /
| * | Fix casting error for float type INI file parameter parsing.Robert Adams2014-01-191-1/+1
| | |
| * | Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-181-12/+39
| |\ \ | | |/
| | * Following on from 50ea2e0, only fetch scene presence for check if ↵Justin Clark-Casey (justincc)2014-01-181-17/+38
| | | | | | | | | | | | lightscript function has failed initial IsEstateManagerOrOwner() check
| | * Fixed: Windlight functions caused an error if called when the script's owner ↵Oren Hurvitz2014-01-181-3/+9
| | | | | | | | | | | | isn't in the scene
| | * Revert "Fixed: Windlight functions caused an error if called when the ↵Justin Clark-Casey (justincc)2014-01-171-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | script's owner isn't in the scene" This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a. Did not mean to apply this yet.
| | * Fixed: Windlight functions caused an error if called when the script's owner ↵Oren Hurvitz2014-01-171-3/+9
| | | | | | | | | | | | isn't in the scene
| * | Remove redundant methods in FlotsamAssetCacheJustin Clark-Casey (justincc)2014-01-181-10/+0
| | |
| * | implement CoreAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+2
| | |
| * | implement GlynnTuckerAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-1/+1
| | |
| * | Properly implement CenomeAssetCache.Check()Justin Clark-Casey (justincc)2014-01-181-2/+4
| | |
| * | Simplify FlotsamAssetCache.CheckFromMemoryCache()Justin Clark-Casey (justincc)2014-01-181-6/+1
| | |
| * | minor: Add method doc to IImproveAssetCacheJustin Clark-Casey (justincc)2014-01-181-1/+25
| | |
| * | Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use ↵Justin Clark-Casey (justincc)2014-01-181-33/+10
| | | | | | | | | | | | using() construct to ensure filestream is always closed
| * | elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()Justin Clark-Casey (justincc)2014-01-181-50/+47
| | | | | | | | | | | | Passed in asset is always not null
| * | minor: reinsert some method doc back into IEntityTransferModuleJustin Clark-Casey (justincc)2014-01-171-0/+20
| | |
| * | minor: since structs are values, assigning them to another variable copies ↵Justin Clark-Casey (justincc)2014-01-171-1/+1
| | | | | | | | | | | | it. Instantiation is unnecessary.
generated by cgit v1.1 at 2024-11-08 06:18:10 +0000