Commit Graph

21624 Commits (e87f70e277e78fb37100b2750fcb09b3aacb1734)

Author SHA1 Message Date
UbitUmarov d64a50ac9b changed locations of m_originRegionID setting to where current core has
them. Changed avatar AbsolutePosition, it still didnt assume m_pos as
 relative to root prim. ( forgot to commit before) ( this sit may still
 have loose ends, specially around the use of OffsetPosition that is now
 relative to root prim and was relative to prim)
2014-07-23 19:56:06 +01:00
UbitUmarov f236b2e5d3 request.DoHTTPGruntWork(..) is now identical to our version, so use
those again, getting code closer to os
 again
2014-07-23 02:14:15 +01:00
UbitUmarov 0331159d2c clamp avatar standup position within region 2014-07-22 21:34:21 +01:00
UbitUmarov f394fabfc0 if sited avatar cross fails, dont add it to physics and dont mess scripts
(?)
2014-07-22 16:28:30 +01:00
UbitUmarov fe900b28c6 CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so
revert previus change assuming it didnt. remove a no longer needed else {}
2014-07-22 15:56:20 +01:00
UbitUmarov ed905418b3 consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and
RETURN_AT_EDGE from simulation
2014-07-22 15:47:42 +01:00
UbitUmarov f9fdf26ec3 make ResetChildPrimPhysicsPositions only do what it is supposed to do and
not what AbsolutePosition does
2014-07-22 15:13:37 +01:00
UbitUmarov cf132430ae tell scripts about positions changes after they are actually changed 2014-07-22 14:50:17 +01:00
UbitUmarov 5269511339 dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog 2014-07-22 14:31:47 +01:00
UbitUmarov 0e4a9e35c7 bug fix. Child position got broken because first prim i parts array may
not be the root prim
2014-07-22 04:10:51 +01:00
UbitUmarov 3e73e96bef fix HUD attachment update filter to allow avatar center etc 2014-07-22 01:49:42 +01:00
UbitUmarov 243499ea4e send updates on selected attachments as sl ( warinin if reverted then a
fix is needed elsewhere since the changes are never sent)
2014-07-22 01:11:18 +01:00
UbitUmarov 0239c7ba1c avatar collisions fix 2014-07-21 23:54:53 +01:00
UbitUmarov 5cdd205ee7 change presence movetotarget avoiding trying to go undergroud or fly when
it can walk. ( still needs better code )
2014-07-21 21:31:48 +01:00
UbitUmarov d9797b6478 change ava to ava collisions a bit 2014-07-21 19:16:23 +01:00
UbitUmarov 726490a994 bug fix 2014-07-21 19:15:51 +01:00
Melanie Thielker 72cead2920 Remove extremely spammy error message that isn't an actual error - user
ids queried may not exist, since LSL can use this as well, with
arbitrary ids
2014-07-20 23:58:46 +02:00
Melanie Thielker 34c40a1e1a Remove some already commented lines 2014-07-20 23:58:16 +02:00
Melanie Thielker c37a88d4f1 Fix LSL portions of sit positioning 2014-07-20 23:54:06 +02:00
UbitUmarov 719880a6ff make sittarget camera relative to root prim
Please enter the commit message for your changes. Lines starting
2014-07-20 20:20:59 +01:00
UbitUmarov 5f364dbed5 another change to standup 2014-07-20 16:09:34 +01:00
UbitUmarov d6f56a4f99 change avatar standup code 2014-07-20 16:03:05 +01:00
UbitUmarov a5fcc0c0c0 remove avn hack on sitted avatars positions 2014-07-20 14:47:35 +01:00
UbitUmarov 79aea3e588 physicsSit SendSitResponse also relative to parent prim 2014-07-20 09:21:00 +01:00
UbitUmarov 931434de87 fix physics sit for physical child prims 2014-07-20 09:15:29 +01:00
UbitUmarov 32b060a608 physics engine cannot change internal positions of linksets, at least not
in teaseupdates
2014-07-20 05:54:51 +01:00
Melanie Thielker b3068355bc Merge branch 'ubitworkmaster' 2014-07-20 02:27:08 +02:00
UbitUmarov dc717303d4 replace old Attachoffset by AttachedPos. Comented out possible merge
artifacts
2014-07-20 01:15:33 +01:00
Melanie Thielker bef76bf3c5 Fix duplicate attach message being sent to objects picked up from the ground 2014-07-20 01:52:26 +02:00
Melanie Thielker 5000a5c038 Fix coalesced objects not showing up as "piles" of prims (AVN only bug) 2014-07-20 00:17:35 +02:00
Melanie Thielker 07c0ee1fbf Fix taking objects 2014-07-19 23:17:26 +02:00
Melanie Thielker e1b2ecdfdc Merge branch 'avination-current'
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2014-07-19 22:32:07 +02:00
UbitUmarov 95b89dd450 fix attachments 2014-07-19 22:18:12 +02:00
UbitUmarov 9654b81b2d revert to capsule representation of avatar collider 2014-07-19 16:16:13 +01:00
UbitUmarov 748fc66ef1 reduce avatar hover in basic ode plugin 2014-07-18 13:19:24 +01:00
UbitUmarov d5e0437465 fix Xengine script instance load 2014-07-18 11:43:31 +01:00
UbitUmarov 19d33c571d Merge branch 'avination-current' into ubitwork 2014-07-16 16:22:32 +01:00
UbitUmarov fc1bd4567d Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2014-07-16 16:16:37 +01:00
Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2014-06-21 00:39:55 +02:00
Melanie Thielker 527c2cdb1e Merge commit '68c8633ba18f0a11cfc0ed04d1d0c7c59e6cec76' 2014-06-21 00:23:11 +02:00
Melanie Thielker 5908e7d0c2 Merge commit '69bc37acd66e9ac9938d4a657dc6b9a0ba9f021e' 2014-06-21 00:22:51 +02:00
Melanie Thielker e0f360e495 Merge commit '4153cfbf14132931b981168b7b3e7c5b8d5be8b5' 2014-06-21 00:22:29 +02:00
Melanie Thielker 711441f922 Merge commit '84eb25da23765b3a4f7ae5513e8a238680bb99f2' 2014-06-21 00:21:29 +02:00
Melanie Thielker 94650c43cd Add forgotten file 2014-06-21 00:08:39 +02:00
Melanie Thielker d97896d39a Differentiate between requests only the owner should be able to do and those
that managers can do when setting parcel data
2014-04-26 20:32:27 +02:00
Melanie Thielker 1d1e444aed Convert region loading to new format 2014-04-26 02:43:13 +02:00
Melanie Thielker 5c661baf6c Allow opening a https port using only http so that nginx can be used for ssl 2014-04-26 02:42:30 +02:00
Justin Clark-Casey (justincc) c77cd6adc7 minor: Remove unused System.Linq reference and use ParcelFlags.None instead of 0 from previous commit cb1f28 2014-04-23 22:59:28 +01:00
Dev Random fb321a0573 Prevent sending Land Properties for unprivileged users 2014-04-23 22:59:13 +01:00
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 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
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