Commit Graph

25520 Commits (8a8acc41bbf9214a58c00931fe2859e2b8c8a7f2)

Author SHA1 Message Date
Melanie Thielker f93dac9239 Implement Oren's fix to prevent a privilege escalation with groups 2014-04-20 10:47:31 +02:00
Melanie Thielker bb841ea9ce Change OfflineMessageModule to support more differentiated return values and allow support for mobile devices and other non-viewer logins 2014-04-06 23:22:37 +02:00
Melanie Thielker a30ad71651 Guard against Scene being null in attachments it the wearing avatar is in the process of logging out. 2014-03-25 03:17:44 +01:00
Melanie Thielker 075cf2baa3 Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels 2014-03-25 03:17:04 +01:00
Melanie Thielker 17aeec8860 Reinstate the timed region change signal 2014-03-25 03:16:37 +01:00
Melanie Thielker c0cdc6b74f Add delete maptile ability to MapImageService - yet untested 2014-03-18 02:16:00 +01:00
Melanie c6e9db5866 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2014-01-28 21:02:20 +00:00
Melanie 4ccb15290e Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2014-01-28 20:47:36 +00:00
Justin Clark-Casey (justincc) cd35d298fa Merge branch 'justincc-master' 2014-01-28 00:23:10 +00:00
Oren Hurvitz 2cf224166f Added osGetRegionSize(), which returns the region size in meters and recognizes megaregions 2014-01-28 00:11:50 +00:00
Justin Clark-Casey (justincc) f7172095e0 Convert tabs to spaces from previous commit 8c2b41b01 2014-01-28 00:04:55 +00:00
Dev Random 8c2b41b01d Make inidirectory files supercede distro files 2014-01-27 23:56:10 +00:00
Justin Clark-Casey (justincc) a4017ee1eb Reinsert attachments list taking code in SP.MakeRootAgent()
Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions.
2014-01-27 23:47:43 +00:00
Justin Clark-Casey (justincc) 1b86239f79 refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which occur no matter which branch of the conditional is executed 2014-01-27 23:17:09 +00:00
Justin Clark-Casey (justincc) e2fbc88d98 Re-enabled NPCModuleTests.TestCreate() 2014-01-27 22:56:51 +00:00
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
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
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 4fb3d314b8 Fix casting error for float type INI file parameter parsing. 2014-01-19 07:37:14 -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