Commit Graph

24174 Commits (8981cba137e6eea28f7a1e8f60e21ae8cad1b67b)

Author SHA1 Message Date
Melanie Thielker f42522b510 Fix protocol versions to wearables count mapping 2015-12-01 16:07:47 +01:00
Melanie Thielker 41072259e4 Change protocol version max to 0.6 2015-12-01 16:01:12 +01:00
UbitUmarov e37c4e878c more changes on lookAt and RotLookAt; do something in attachments 2015-12-01 12:11:48 +00:00
UbitUmarov a9e58d6175 some changes due to lookAt and RotLookAt 2015-12-01 10:15:38 +00:00
UbitUmarov 193b3079e4 Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-12-01 09:43:05 +00:00
UbitUmarov c277dbd66c fix a more few typos 2015-12-01 09:42:28 +00:00
Robert Adams e4d0ae4f6e BulletSim: fix collision sound calculation. Modify some routines to make
collider and collidee clearer. Also fix (when did it break?) avatars not moving
if standing on a moving object. Now friction will move avatars if standing
on a disc or the top of a train.
2015-11-30 20:51:12 -08:00
UbitUmarov b453ef0fbd fix a few typos 2015-11-30 19:47:58 +00:00
UbitUmarov fbef862aee add a few more known texture IDs 2015-11-30 19:45:44 +00:00
UbitUmarov d952b267e9 Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-11-29 18:28:14 +00:00
UbitUmarov 25f13f7c01 fix llLookAt in non-physical case 2015-11-29 18:27:34 +00:00
Diva Canto 55a9bbc6ce Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-11-29 09:48:48 -08:00
Diva Canto 1aa0234408 Trying to make http requests less slow, according to http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow 2015-11-29 09:48:17 -08:00
UbitUmarov 302d28625d change llLookAt math to master cleaner solution, assuming lAxis2rot does work 2015-11-29 14:36:09 +00:00
UbitUmarov ca026ac735 fix the default shape type on upload, it is always convex 2015-11-29 00:19:25 +00:00
UbitUmarov 15f8a46216 let Bullet do collision sounds (RAdams plz fix the relative speed) 2015-11-29 00:02:46 +00:00
UbitUmarov 82e464cb8c let old ODE trigger collision sounds like ubOde 2015-11-28 23:44:53 +00:00
UbitUmarov 9928076d1a remove terrain height clamping left over the ushort format testing 2015-11-27 23:46:58 +00:00
UbitUmarov f59350a1ee add a nasty global lock, ode.dll requires on multi regions per instance ( also make sure ninjaJoints are disabled 2015-11-27 22:50:28 +00:00
UbitUmarov 5aa1c0d328 coment out warnings that do a messed around number of threadpool workitens and number of active threads ( at least when a pool is in use) 2015-11-27 18:43:17 +00:00
Diva Canto cade717b5f Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-11-27 08:24:39 -08:00
Diva Canto 5b7a585b4f Sometimes the viewer sends a null string as mapName; this made the client thread throw an exception with unexpected behavior for users (nothing happens). This commit gives it a sane default: it assumes we're looking for a position in the current region. 2015-11-27 08:22:30 -08:00
UbitUmarov 3304e52750 add a delay to consume other change messages on move and cross 2015-11-27 14:56:04 +00:00
UbitUmarov f1bbc4d386 stop some requests processing when module as no scenes (there must be a better way to fix this) 2015-11-27 14:39:11 +00:00
UbitUmarov bb0db96256 DeregisterRegion from grid earlier on close 2015-11-27 14:01:42 +00:00
UbitUmarov e2fb600bf5 change Backup on scene close to Forced, and not dependent on last change time. 2015-11-27 13:56:57 +00:00
UbitUmarov c5395cef74 remove thread Heartbeat from watchdog 2015-11-27 13:45:14 +00:00
UbitUmarov 9224b5d680 revert last change to watchdog timeouts, that should not be needed 2015-11-27 13:32:49 +00:00
UbitUmarov baf8e762a6 change JobEngine stop code and add a extra check for thread removed on watchdog timeout checks 2015-11-27 13:28:10 +00:00
UbitUmarov 3029080d9b change threading on GetTexture and getMesh and WebFetch Modules. 2015-11-27 07:38:54 +00:00
UbitUmarov f16d36627f change threading on GetTexture and GetMesh NonSharable region modules 2015-11-27 05:00:11 +00:00
Jak Daniels c0e920c1ad Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856 A comparison of consistent 'default' values determines whether boundingBox check is true.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-27 00:16:08 +00:00
Melanie Thielker 9afe2b018f Mantis #7765: Add new ClampNegativeZ option. Defaults to false to restore prior functionality.
Avination code wasn't designed for deep building.
2015-11-26 17:29:50 +01:00
UbitUmarov 172bb05ec2 suspend the use of DisableSimulator, that is causing teleport and crossing issues 2015-11-25 04:13:13 +00:00
UbitUmarov 1484348d7f Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-11-25 03:22:20 +00:00
UbitUmarov 583c874773 remove default of 60minutes on MapImageService Refresh time, forgotten from early merge debug 2015-11-25 03:21:38 +00:00
Melanie Thielker 774ac5e96b If no job engine is started at all, keep checking it's status from
bombing
2015-11-24 21:10:40 +01:00
UbitUmarov 6d5b405168 simplify DeliverChatToAvatars(..) ( hopefully not breaking it ) 2015-11-24 17:28:05 +00:00
UbitUmarov a0c3297b37 again chat echos, check repeats uncondicionally 2015-11-24 15:12:39 +00:00
UbitUmarov 08d061d201 reset control even prior to use 2015-11-24 14:28:35 +00:00
UbitUmarov f45905851a at end of teleport disable the sending simulator, not destiny 2015-11-24 14:01:51 +00:00
UbitUmarov 7cf2d261b3 reduce 'echos' on several regions per instance (mantis 7754) 2015-11-24 12:51:58 +00:00
UbitUmarov 19b96697a6 try not to use Process.HasExit that is broken in some mono versions 2015-11-24 11:22:40 +00:00
Diva Canto 5e4b16658b Flipped version to 0.9.0.0 2015-11-23 18:15:09 -08:00
UbitUmarov 87464b5039 remove a debug message 2015-11-24 02:03:38 +00:00
UbitUmarov 9d8fe7f3db revert previus commit 2015-11-23 23:10:02 +00:00
UbitUmarov 81eb9816a2 remove libomv detection/log from llLoginService 2015-11-23 23:03:16 +00:00
UbitUmarov e9345479c4 remove warning on siting in phantom prims without sittarget 2015-11-23 22:11:27 +00:00
Jak Daniels 15af6265a1 Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 17:30:08 +00:00
UbitUmarov f75d113230 change silly Monitor use 2015-11-22 08:40:55 +00:00
UbitUmarov ec069edead change syncronization method 2015-11-22 08:31:54 +00:00
UbitUmarov e28eecd0bf revert take the Monitor.wait out of the locks 2015-11-22 08:08:01 +00:00
UbitUmarov 1de096dffb coment out merge option on multiregion oar load i added 2015-11-22 08:00:58 +00:00
UbitUmarov 5c3f88b64d take the Monitor.wait out of the locks 2015-11-22 07:55:49 +00:00
UbitUmarov b80cbf5060 a few more changes on Multiregion control file load 2015-11-22 07:18:11 +00:00
UbitUmarov a6187db2a7 add a a missing monitor.wait if still not needed, mb in future 2015-11-22 05:44:06 +00:00
UbitUmarov 3be340cbf2 a few changes on Multiregion control file load ; load oar seems far from good 2015-11-22 05:42:13 +00:00
UbitUmarov f6820959b7 add Monitor.wait on load 2015-11-22 04:49:01 +00:00
UbitUmarov 4349bde440 reduce noise before compare 2015-11-22 04:10:26 +00:00
UbitUmarov 6dcbd20cfa add merge option on multioar test 2015-11-22 03:58:07 +00:00
UbitUmarov 71f5c2b856 minor changes 2015-11-22 03:56:48 +00:00
UbitUmarov 541d2ce2cd don't use 'funny' Quaternions 2015-11-22 02:22:48 +00:00
Jak Daniels 0b216c37df Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:48 +00:00
Jak Daniels cc992bf156 Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:36 +00:00
Jak Daniels 7cac0ccbe3 Changes to TerrainChannel/ITerrainChannel to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:32:08 +00:00
Jak Daniels b23e5fd8b6 Changes to LandObject/ILandObject to support importing OARs with different Region sizes to the destination region.
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
2015-11-22 01:31:48 +00:00
Shy Robbiani 01e7fa3095 row format fixed removed to allow creation of regions table
row_format=fixed is not supported by innodb and has broken the creation
of the regions table during the first startup of ROBUST. It must be a
relict from MyISAM. Also removed the probably inappropriate table
comment.

Signed-off-by: Kevin Cozens <kevin@ve3syb.ca>
2015-11-21 20:03:42 -05:00
UbitUmarov 88b3545ec3 add a missing override 2015-11-21 19:56:57 +00:00
UbitUmarov c84334fc72 add a missing override 2015-11-21 19:53:14 +00:00
UbitUmarov 11342314e1 add thread allocation calls for new ode.dll (old ode) 2015-11-21 02:53:35 +00:00
UbitUmarov 0b36d4ea2f some cleanup, allow cast rays to collide with terrain within limited range (old ode) 2015-11-21 02:14:19 +00:00
UbitUmarov 3f4fdacb34 remove a warning 2015-11-21 01:55:17 +00:00
UbitUmarov 156fdd4908 remove some duplicate using statements 2015-11-21 01:49:31 +00:00
UbitUmarov 36426b0db2 remove some compile warnings increasing total number by 2 2015-11-21 00:49:43 +00:00
UbitUmarov 019d057563 stop the Vehicle AFTER fixing position not before, bc stop code also updates position (old ode) 2015-11-20 19:40:04 +00:00
UbitUmarov 395d160c41 stop a Vehicle on a failed region cross (or empty border) (old ode) 2015-11-20 19:11:26 +00:00
UbitUmarov 53895289a6 remove Ode.Net - missing file. ( old ode may be broken now) 2015-11-20 18:48:48 +00:00
UbitUmarov 25983c1ba9 remove the hard to maintain Ode.Net wrapper only in use by old ode 2015-11-20 18:25:56 +00:00
UbitUmarov ca5ec4c33b make llAvatarOnLinkSitTarget(0) return UUID.Zero 2015-11-20 01:44:19 +00:00
UbitUmarov 4a0531244a change a log message from error to just Debug 2015-11-20 00:45:12 +00:00
UbitUmarov 98a00cbce5 ubOde: add threading related calls new ode.dll may need. Hope this doesn't break with current linux ode library 2015-11-20 00:37:41 +00:00
UbitUmarov 0c93159297 remove unused return value on DeliverMessageTo() 2015-11-20 00:09:56 +00:00
UbitUmarov 278687b1e8 remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this are still merge issues 2015-11-20 00:01:13 +00:00
UbitUmarov 36f7e96392 clean code a bit 2015-11-19 15:02:12 +00:00
UbitUmarov 2e43343ca9 ClearPartAttachmentData before adding object to scene, not after 2015-11-19 14:45:39 +00:00
UbitUmarov 8505ca88dd work around some 'tests' errors: use one autoresetevent per scene 2015-11-19 02:46:25 +00:00
UbitUmarov 759fda0871 work around some 'tests' errors: reset the event at start of new test. 2015-11-19 02:43:49 +00:00
UbitUmarov 9c5acb3df4 work around some 'tests' errors: just a test 2015-11-19 01:43:33 +00:00
UbitUmarov f242137e31 work around some 'tests' errors: add a DefaultPermitions module to sceneB 2015-11-19 01:18:34 +00:00
UbitUmarov a4ed111de1 cleanup indentation 2015-11-18 17:45:56 +00:00
UbitUmarov 6dafce9a12 fix another variable number of wearable types issue 2015-11-18 17:35:26 +00:00
UbitUmarov 0fbb4f0067 work around some 'tests' errors: dont expect a particular http error response 2015-11-18 01:05:46 +00:00
UbitUmarov 62cacff071 add LegacySitOffsets handling at LSL api 2015-11-17 18:17:11 +00:00
UbitUmarov da5aad87bf start adding LegacySitOffsets option. TRUE will prevent the use of new math for the compensation of SL sittarget bug, and so not break content. (this is the main code change) 2015-11-17 17:41:09 +00:00
UbitUmarov eab427e58b work around some 'tests' errors: UUID.Zero is a invalid ownerID - missing file 2015-11-17 09:00:18 +00:00
UbitUmarov 0991ad321a work around some 'tests' errors: UUID.Zero is a invalid ownerID 2015-11-17 08:58:00 +00:00
UbitUmarov 6c766f3ab4 remove unused parameter - missing file 2015-11-17 08:02:48 +00:00
UbitUmarov f7f5aba597 remove unused parameter 2015-11-17 07:59:11 +00:00
UbitUmarov cd29abf1ac work around some 'tests' errors: fix wrong parameters 2015-11-17 07:22:36 +00:00
UbitUmarov 81b7f5551c work around some 'tests' errors: sp attachments and appearance are not in sync 2015-11-17 06:52:03 +00:00
UbitUmarov 51d0087a49 work around some 'tests' errors: AgentGroupDataUpdate is udp 2015-11-17 06:42:45 +00:00
UbitUmarov 2ba14f82fe work around some 'tests' errors: a new event queue has a few null events 2015-11-17 06:23:57 +00:00
UbitUmarov bbfeca4b0c work around some 'tests' errors: a new event queue has a few null events 2015-11-17 06:19:45 +00:00
UbitUmarov 16d158f2f1 work around some 'tests' errors: missing call to InventoryDeQueueAndDelete() 2015-11-17 05:49:39 +00:00
UbitUmarov 9566c000f2 work around some 'tests' errors: terrain effects limits changed 2015-11-17 05:25:08 +00:00
UbitUmarov dd18c9f689 fix llRequestAgentData cache timeout 2015-11-17 05:14:54 +00:00
UbitUmarov 364082d0e8 work around some 'tests' errors: add a httpserver 2015-11-17 04:19:30 +00:00
UbitUmarov 1e87e90915 work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits 2015-11-17 03:42:46 +00:00
UbitUmarov 4e74564caa work around some 'tests' errors: suspend TestllSetLinkPrimitiveParamsForAgent bc avatar sit math changed 2015-11-17 03:16:37 +00:00
UbitUmarov d1737de8d2 work around some 'tests' errors: Coalesced objects handling has changed 2015-11-17 03:10:59 +00:00
UbitUmarov 8567ef3c40 work around some 'tests' errors: test for null cacheItems 2015-11-17 03:00:27 +00:00
UbitUmarov 4660c3076c work around some 'tests' errors: assets are modified by the test, on current code 2015-11-17 02:08:01 +00:00
UbitUmarov ec0a16c559 work around some 'tests' errors: suspend sit on sittarget until im not 2 sleepy to fix the math 2015-11-17 01:53:44 +00:00
UbitUmarov 083b52173b work around some 'tests' errors: suspend undo-redo tests until new ones can be written to conform to new code 2015-11-17 01:44:15 +00:00
UbitUmarov e15ebc091f bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates 2015-11-17 01:31:06 +00:00
UbitUmarov 67aefb5e42 bug fix: StateSource of a SOG that is not a attachment is StateSource.PrimCrossing 2015-11-17 00:48:35 +00:00
UbitUmarov 895a57e426 work around some 'tests' errors: backup is async 2015-11-16 23:25:28 +00:00
UbitUmarov 9c5646a1ba work around some 'tests' errors: dont use references to objects that may have been deleted 2015-11-16 23:21:58 +00:00
UbitUmarov 52a3cc39e9 work around some 'tests' errors: fix math 2015-11-16 22:41:36 +00:00
UbitUmarov 3a65627481 work around some 'tests' error: internal GroupResize() doesn't heave Undo 2015-11-16 21:42:39 +00:00
UbitUmarov 10d5c80910 work around some 'tests' error: object is deleted on DeRezObjects, fix last commit side effects 2015-11-16 21:28:59 +00:00
UbitUmarov ca4b7efd0f dont find parts of groups marked as Deleted 2015-11-16 21:11:22 +00:00
UbitUmarov 99ecf522cd work around some 'tests' error: object is deleted on DeRezObjects 2015-11-16 20:59:57 +00:00
UbitUmarov 250db8c82a work around some 'tests' error: object crossing is async 2015-11-16 20:34:23 +00:00
UbitUmarov d19e4f598f deatach from backup on attachment 2015-11-16 20:12:40 +00:00
UbitUmarov 95a7a03052 work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception, missed a few more 2015-11-16 19:00:53 +00:00
UbitUmarov fd2784a037 work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception 2015-11-16 18:50:15 +00:00
UbitUmarov a2e376e993 work around some 'tests' error: contents of link folders are no longer sent 2015-11-16 18:43:11 +00:00
UbitUmarov 554f591eb6 work around some 'tests' errors 2015-11-16 18:19:54 +00:00
UbitUmarov 9b6633697b coment out excessive debug messages 2015-11-16 17:35:20 +00:00
Melanie Thielker b2592ab132 Fix a merge conflict 2015-11-16 15:30:39 +01:00
Melanie Thielker f93ce485b1 Merge branch 'master' into avinationmerge
Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
UbitUmarov 53e0cd5534 handle diferente number of wearables on getting assets form another appearance 2015-11-15 10:04:35 +00:00
UbitUmarov bcb27d4406 fix the protection for more Wearables than region suports 2015-11-15 08:16:52 +00:00
Diva Canto f5799ff445 That didn't actually do anything for Simian, and it broke the locahost
case
Revert "Also restoring proper function for Simian external GetTexture functionality."

This reverts commit 366e81b977.
2015-11-14 08:10:27 -08:00
Diva Canto 3515fda101 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-11-12 18:31:27 -08:00
UbitUmarov 75befda6df Add some values to the SimulatorFeatures cap's OpenSimExtras section relative to FPS statistics. This is transition code ported from avinationmerge. 2015-11-13 02:12:13 +00:00
UbitUmarov 752a1534f8 add the option Normalized55FPS. This is transition code ported from avinationmerge branch. (configration file changes will be commited later) 2015-11-13 01:12:37 +00:00
UbitUmarov 55cce6aee0 minor: reset character collision flags, even if without a Body 2015-11-12 22:40:55 +00:00
UbitUmarov 9bd6befdeb add some safeguard checks 2015-11-12 21:24:14 +00:00
Melanie Thielker 8c7f475740 Add some values to the SimulatorFeatures cap's OpenSimExtras section:
SimulatorFPS: The actual optimal FPS of the simulator, un-fudged
SimulatorFPSFactor: The fudge factor that is applied to the stats sent to the viewer
SimulatorFPSWarnPercent: The percentage below which a lag meter should go to amber
SimulatorFPSCritPercent: The percentage below which a lag meter should go to red
To display the real values, a viewer would divide the reported FPS by the SimulatorFPSFactor and use that to calculate the percentage of SimulatorFPS. E.g. reported is 55fps, SimulatorFPSFactor is 5.0 and SimulatorFPS is 11.
2015-11-12 21:13:44 +01:00
Melanie Thielker d3911606ef Move a call to RequestModuleInterface to a new scene callback function
because the current implementation would have always returned null
2015-11-12 20:34:09 +01:00
UbitUmarov 649a3fc39c dont abort llDialog if buttons labels are longer than 24bytes, let udp truncate. This is not as spec but allows old scripts or with minor bugs to still work 2015-11-11 06:06:22 +00:00
UbitUmarov adda0ab7d8 limit llDialog buttons text to 24 bytes (at lludp level) 2015-11-11 05:55:34 +00:00
UbitUmarov b383cdae33 fix cut points of UTF-8 strings 2015-11-10 20:08:44 -08:00
UbitUmarov 2b937fdf40 reduce the small MTU violation sending terrain compressed patchs 2015-11-10 23:56:08 +00:00
UbitUmarov 188b2d84c1 increase the number of packets in Land queue that force terrain to delay patchs sending. 2015-11-10 23:50:00 +00:00
UbitUmarov e096b49dd7 check if a packet can be sent imediatly without accounting it as sent on throttles when it is enqueued for later send. 2015-11-10 23:17:56 +00:00
UbitUmarov 40cb83b555 make m_minimumDripRate a bit larger than mtu. Add a bucket space check that does not consume avaiable space, so reducing bandwidth 2015-11-10 22:50:20 +00:00
UbitUmarov f57a48a0fb fix silly bug 2015-11-10 20:34:19 +00:00