Commit Graph

21059 Commits (3a2c09916971779508bd4628e483cb738ededd12)

Author SHA1 Message Date
Justin Clark-Casey (justincc) 0eda7dd1c7 Merge branch 'justincc-master' 2014-01-24 19:41:41 +00:00
Justin Clark-Casey (justincc) fea8345f56 minor: remove long unused state queue from "show queues" console reports 2014-01-24 19:40:14 +00:00
Justin Clark-Casey (justincc) c9b5ba78d9 minor: correct the usage statement on the "show image queues" console command - should not have been "image queues show" 2014-01-24 19:36:12 +00:00
Justin Clark-Casey (justincc) 4a9796a506 Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) from the "show queues" console report to stop screwing up formatting.
"show pquques" already did this
2014-01-24 19:31:31 +00:00
Robert Adams afb2e07111 varregion: pass region size in more HG services. 2014-01-24 06:30:38 -08:00
Mic Bowman 674a3a5639 Enable the simulator to handle region size information returned from
a hypergrid gatekeeper. Fields are "size_x" and "size_y". Server side
will be updated separately.
2014-01-23 16:20:18 -08:00
Justin Clark-Casey (justincc) 966ab21839 Merge branch 'justincc-master' 2014-01-24 00:17:39 +00:00
Justin Clark-Casey (justincc) a2d5d810e0 Properly dispose of drawing objects to reduce/stop memory leakage on generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults) 2014-01-24 00:14:58 +00:00
Justin Clark-Casey (justincc) a859464e91 Add "generate map" console command to allow manual regeneration and storage of maptiles
Primarily for test purposes though could be useful if one prefers to manually update the map tile
2014-01-23 23:44:21 +00:00
Robert Adams 4c362a83f9 Merge branch 'master' into varregion 2014-01-21 11:31:51 -08:00
Mic Bowman 83626e60e6 Adds a configuration option to cannibalize bandwidth from the
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.
2014-01-20 18:59:43 -08:00
dahlia 7bd42fc42f Add back code to UuidGatherer to retrieve UUIDs for materials stored in DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented 2014-01-20 15:01:18 -08:00
dahlia af58631f00 rather than converting existing materials to assets, just retrieve them and make them available for viewing. Any new materials added to the scene will become assets. 2014-01-20 13:57:14 -08:00
dahlia 719810e9d8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-01-20 11:54:36 -08:00
dahlia 1cae3664a5 add null texture entry face check before converting legacy materials 2014-01-20 11:53:33 -08:00
Justin Clark-Casey (justincc) 5fc871027e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-01-20 19:38:47 +00:00
Justin Clark-Casey (justincc) 2cf7478b9a Merge branch 'justincc-master' 2014-01-20 19:34:55 +00:00
Mic Bowman 2e78e89c36 Clean up orphaned json stores. This can happen when an object is
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.
2014-01-20 11:33:49 -08:00
Justin Clark-Casey (justincc) 8e72b53edc Stop exceptions being generated on agent connection if a telehub object has been deleted or has no spawn points. 2014-01-20 19:16:19 +00:00
dahlia 4800303abd update OpenMetaverse.StructuredData to git master (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity 2014-01-20 03:18:36 -08:00
dahlia 36d8a24a86 force SOG update when converting legacy materials to ensure changes are persisted 2014-01-20 03:11:01 -08:00
dahlia 95c926b2cd delay texture entry parsing until absolutely necessary while converting legacy materials 2014-01-20 03:02:30 -08:00
dahlia 28723beb0c Add code to convert legacy materials stored in DynAttrs to new asset format and store them as assets 2014-01-20 02:57:08 -08:00
Oren Hurvitz d1f16c4b4b Check agent permissions before modifying an object's materials. Also, when creating a Material asset, set the current agent as the Creator. 2014-01-20 00:38:44 -08:00
Oren Hurvitz 68d83425c6 When asked to change the Material for one face, change only that face; not the default material 2014-01-20 00:38:43 -08:00
Oren Hurvitz 3018b2c5d7 Materials module: a) Store materials as assets; b) Finalized it (removed the "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'.
2014-01-20 00:38:42 -08:00
Oren Hurvitz ca0336d834 Renamed MaterialsDemoModule to MaterialsModule 2014-01-20 00:38:41 -08:00
Oren Hurvitz e8273fa8ad - Materials: support the viewer removing the material (in which case matsMap["Material"] is missing) - Reduced logging 2014-01-20 00:37:26 -08:00
Robert Adams 90fa3202c6 varregion: remove debugging splat file saving that fills up the
maptile dir and causes errors.
2014-01-19 13:37:51 -08:00
Robert Adams 5e6a47f13f varregion: remove --noterrain and --noparcel parameters in 'load oar'.
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>".
2014-01-19 12:45:16 -08:00
Robert Adams 6fbfb47b92 varregion: add --noterrain and --noparcel to 'load oar'.
--noterrain suppresses the loading of the terrain from the oar.
--noparcels suppresses the loading of parcel information from the oar.
2014-01-19 11:03:08 -08:00
Robert Adams dd6db72939 varregion: add --displacement parameter to 'load oar'.
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
2014-01-19 10:09:43 -08:00
Robert Adams f127e4b4ee Merge branch 'master' into varregion 2014-01-19 07:38:53 -08:00
Robert Adams 4fb3d314b8 Fix casting error for float type INI file parameter parsing. 2014-01-19 07:37:14 -08:00
Robert Adams 54a4b9eab4 varregion: Update Warp3D to properly handle varregions.
This includes additions to Warp3D:
   Optional rendering of mesh and scupltie prims (INI parameter. Off by default)
   Texturing of large prims (INI parameter. On by default)
   Better garbage collection
2014-01-19 07:33:56 -08:00
Robert Adams 813f0da00b Add J2K decoder routine that converts directly to an image. 2014-01-19 07:32:41 -08:00
Robert Adams 08fa0a6a8a Fix casting error for float type INI file parameter parsing. 2014-01-19 07:26:55 -08:00
Robert Adams 60de0bc3c2 varregion: split up generated maptile images for storage in map. This
makes maps for varregions show up properly.
2014-01-19 05:09:03 -08:00
Justin Clark-Casey (justincc) d466446df3 Merge branch 'justincc-master' 2014-01-18 01:39:45 +00:00
Justin Clark-Casey (justincc) e9454d4672 Following on from 50ea2e0, only fetch scene presence for check if lightscript function has failed initial IsEstateManagerOrOwner() check 2014-01-18 01:36:40 +00:00
Oren Hurvitz 50ea2e0d67 Fixed: Windlight functions caused an error if called when the script's owner isn't in the scene 2014-01-18 01:26:30 +00:00
Justin Clark-Casey (justincc) 0cbe5f8424 Remove redundant methods in FlotsamAssetCache 2014-01-18 00:55:49 +00:00
Justin Clark-Casey (justincc) b9453a8f6f implement CoreAssetCache.Check() 2014-01-18 00:52:36 +00:00
Justin Clark-Casey (justincc) 427ffd3387 implement GlynnTuckerAssetCache.Check() 2014-01-18 00:48:20 +00:00
Justin Clark-Casey (justincc) fc7ccfdafa Properly implement CenomeAssetCache.Check() 2014-01-18 00:30:23 +00:00
Justin Clark-Casey (justincc) ee8ba1ab9a Simplify FlotsamAssetCache.CheckFromMemoryCache() 2014-01-18 00:21:53 +00:00
Justin Clark-Casey (justincc) d381da81d6 minor: Add method doc to IImproveAssetCache 2014-01-18 00:15:38 +00:00
Justin Clark-Casey (justincc) 97fbb8ed45 Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use using() construct to ensure filestream is always closed 2014-01-18 00:12:12 +00:00
Justin Clark-Casey (justincc) 12bfce7b9f elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache()
Passed in asset is always not null
2014-01-18 00:06:12 +00:00
Justin Clark-Casey (justincc) b52b50ee56 minor: reinsert some method doc back into IEntityTransferModule 2014-01-17 23:36:23 +00:00