OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,648 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

2699 Commits (7c50651cd12eaa5830d8b17c07786f1f497ddca9)

Author SHA1 Message Date
UbitUmarov 17f2838757 testing update libomv dlls to .net4.6 2018-01-12 03:32:55 +00:00
UbitUmarov a3e50ef8dc testing update Warp3d.dll to .net4.6 2018-01-12 03:15:48 +00:00
UbitUmarov 98f79cf735 testing update XMLRPC.dll to .net4.6, not this is not same source that previus one.. so we may have other issues 2018-01-12 03:12:01 +00:00
UbitUmarov 3c3b8fc759 testing update httpserver.dll to .net4.6 2018-01-12 03:07:51 +00:00
UbitUmarov 875ca104b8 Merge branch 'master' into httptests 2018-01-05 22:37:42 +00:00
UbitUmarov 7f49364d65 remove some tabs added to config files 2018-01-04 22:52:29 +00:00
UbitUmarov 2811e5cef3 update configuration files and examples for mutes 2018-01-04 21:21:38 +00:00
UbitUmarov ab0f866087 Merge branch 'master' into httptests 
# Conflicts:
#	prebuild.xml
 2017-12-12 22:19:31 +00:00
UbitUmarov a95e286168 increase sample rate of WaitGetScenePresence() 2017-12-11 23:36:42 +00:00
TomTheDragon 98f90f4eed Changing map tile colors This change also allows setting the water color, as well as the 4 colors for textured map tiles. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2017-11-13 20:43:16 +00:00
UbitUmarov cdb7d506fd Merge branch 'master' into httptests 2017-11-12 03:26:48 +00:00
UbitUmarov eaa239eb06 add a warning in opensim.ini.example mute lists, about the fact viewers cache beening shared by all grids, and that can be confusing 2017-11-12 03:26:10 +00:00
UbitUmarov ca4804b758 Merge branch 'master' into httptests 2017-11-12 03:18:02 +00:00
UbitUmarov 8e8108c78c change opensim.ini.example mutes coments to express what our current code does 2017-11-12 03:16:40 +00:00
UbitUmarov 16a8e166ff Merge branch 'master' into httptests 2017-10-26 19:01:16 +01:00
Kevin Cozens 6a5b234262 Fixed typo in a comment. 2017-10-26 13:43:36 -04:00
Kevin Cozens 70d693eff2 Added missing Allow line for osGetSimulatorMemoryKB. 2017-10-26 13:42:54 -04:00
Kevin Cozens 5cc41eee34 Sorted the groups of Allow statements by alphabetical order. 2017-10-26 13:40:59 -04:00
UbitUmarov b1814d3492 Merge branch 'master' into httptests 2017-10-01 18:05:10 +01:00
Robert Adams cc915b4d05 BulletSim: update MacOS version of libBulletSim to latest version. 
See Mantis 8232.
   Thanks Gavin Hird.
 2017-09-20 21:02:00 -07:00
UbitUmarov e4dfa50654 replace libomv saving a few op on vector * quaternion 2017-09-17 04:43:53 +01:00
UbitUmarov ca493a1beb Merge branch 'master' into httptests 2017-09-05 20:25:12 +01:00
Robert Adams 921e3ceb09 BulletSim: Merge branch 'BulletSim2017' 
Adds raycast using Bullet physics engine.
 2017-09-05 06:24:04 -07:00
UbitUmarov 86493d75fa Merge branch 'master' into httptests 2017-09-04 18:39:42 +01:00
Kevin Cozens e08b051ca6 Fixed typos in comments in osslEnable.ini 2017-09-04 13:30:16 -04:00
Robert Adams 6c5cfbafba BulletSim; Update BulletSim.dll's and so's for raycast. 2017-09-03 17:14:59 -07:00
UbitUmarov 34da125a4d fix our name is OpenSimulator not OpenSim 2017-08-31 15:25:14 +01:00
UbitUmarov 3fe3471532 improve Prefer32bit configuration option 2017-08-31 15:17:42 +01:00
UbitUmarov a578df9589 CSharp targets name still wrong 2017-08-31 11:29:00 +01:00
UbitUmarov b9fc629bdf fix a whitecode bug, add missing files 2017-08-31 11:23:03 +01:00
UbitUmarov 41e8b9f91f update Prebuild with WhiteCore version 2017-08-30 22:24:07 +01:00
UbitUmarov e4747b938b update httpserver 2017-08-28 13:33:37 +01:00
UbitUmarov 8434def603 update ODE bins for windows to 0.13.3 ( old ode will now also have stati/dynamic friction, cant avoid it 2017-08-21 05:00:18 +01:00
UbitUmarov f9c01db33c Merge branch 'master' into httptests 2017-08-19 22:48:31 +01:00
Robert Adams 1fdd56f987 BulletSim: Update macOS version of BulletSim with the actual Bullet 
2.86. (the last commit was really an update to 2.82).
    Thanks Gavin Hird.
 2017-08-18 12:44:29 -07:00
UbitUmarov e2ca5853fc Merge branch 'master' into httptests 2017-08-18 04:33:21 +01:00
Diva Canto 2df4c1bb91 Replaced libomv dlls with newly compiled ones to solve crashes with pCampBot. See 
e8250162cc
 2017-08-17 17:43:58 -07:00
Robert Adams c804835801 BulletSim: Update macOS version of BulletSim with Bullet 2.86 and collision fixes. 
Thanks Gavin Hird.
 2017-08-17 10:33:18 -07:00
UbitUmarov 6d4b0a8ce3 Merge branch 'master' into httptests 2017-08-16 05:05:57 +01:00
Robert Adams 78c78f69b1 Merge branch 'master' into BulletSim2017 2017-08-15 09:04:03 -07:00
UbitUmarov bf84e46c59 update libode for MAC, thanks again Gavin Hird 2017-08-15 16:01:56 +01:00
Robert Adams 76c29cb106 Update BulletSim with corrected collision computations. 
A fix for Mantis 8010.
 2017-08-14 18:46:16 -07:00
Robert Adams 2afd158b1d Update BulletSim with Bullet V2.86. 
Should be no functional changes.
 2017-08-09 13:43:44 -07:00
Kevin Cozens e9b7971929 Remove profile from basic configuration 2017-08-05 15:44:05 -04:00
UbitUmarov 169a50286b upload ODE lib for linux. Plz keep previus version in case something goes wrong. Thanks jakdaniels for the compilation 2017-07-29 00:08:40 +01:00
UbitUmarov 324bda8ab9 mantis 8218 make Meshmerizer UseMeshiesPhysicsMesh defualt to true, to match stated on ini files. 2017-07-27 16:23:08 +01:00
UbitUmarov 93582523a7 ubOde: make option MinSizeToMeshmerize visible in OpenSimDefaults.ini 2017-07-22 01:44:29 +01:00
UbitUmarov f6f0b1c513 fix a few EN typos 2017-07-21 14:41:13 +01:00
UbitUmarov 66a5b4d120 ubOde suport convex shapes on all normal prims and sculpts. Since code is experimental this is controled by options ConvexPrims and ConvexSculpts, on section Mesh, that can be set to false in case of problems 2017-07-21 14:11:03 +01:00
UbitUmarov fe6ad384e4 merge 2017-07-20 11:30:12 +01:00
UbitUmarov 4b7f79e296 fixes and changes on TreePopulatorModule. Please read OpenSimDefaults.ini 
[Trees] section. Does need more work, and some hardcode settings may not
be the optimal still"
 2017-07-15 04:07:03 +01:00
UbitUmarov 4fe13ef639 update libomv fixing EnUsCulture 2017-07-13 05:21:00 +01:00
UbitUmarov dfef16297b ubOde don't use old ode body sleep option, a few changes on sleep control, update ode.dll (windows, others needed) (keep older versions.. bc.. well bugs happen) 2017-07-07 01:49:34 +01:00
UbitUmarov 39751891f4 ubOde: dont do avatar step climb on small true spheres. lets play simple football 2017-07-03 22:47:27 +01:00
UbitUmarov c5a4c299cb update ode.dll ( windows) 2017-07-02 05:59:49 +01:00
UbitUmarov edc7575f9e a few changes to ubOde avatar collisions 2017-07-01 01:43:58 +01:00
UbitUmarov 965d004fbe do calls to m_host.AddScriptLPS() on the right place on osslm this stat is of course still wrong LPS does not mean api function calls 2017-06-30 22:39:19 +01:00
UbitUmarov 6b0a3e981c put osGetAgentIP() in threat control with level Severe so it can be disabled even for inworld administrators as needed on some grids. rearrage the osslEnable.ini file segregating the funtions only listed for information 2017-06-30 22:04:56 +01:00
UbitUmarov aa4eb2bc14 update ode.dll (windoes only. need bins for others :( ) 2017-06-30 00:30:46 +01:00
UbitUmarov e243dd0519 put back getAgentIP bug restricted, script owner must be a Administrator (god) 2017-06-28 02:19:27 +01:00
UbitUmarov e53f439981 add osGetNPCList() 2017-06-26 20:42:49 +01:00
UbitUmarov 3fda7c6315 take a few more out of level check 2017-06-26 20:23:24 +01:00
UbitUmarov 9ea6580c37 update osslEnable.ini. functions that have no level check are still listed but commented, just to be more visible 2017-06-26 20:05:11 +01:00
UbitUmarov 84abdf866a add respective ossl helper funtion osDrawScaleTransform(string drawList, LSL_Float x, LSL_Float y) 2017-06-25 02:26:36 +01:00
UbitUmarov cb8975e567 add string osDrawTranslationTransform(string drawList, LSL_Float x, LSL_Float y), string osDrawRotationTransform(string drawList, LSL_Float x) and string osDrawResetTransform(string drawList) helper functions for the new vector renderer comands. Removed ThreadLevel check of similar funtions that had it None, and actually only set strings 2017-06-24 23:04:37 +01:00
UbitUmarov 1a8a77c41e revert the thread level change; remove unused dynamic texture timer from internal code; let blend alpha work if < 255; let blend work with the selected face; etc 2017-06-24 09:24:56 +01:00
UbitUmarov ed8fc359f3 change thread level of osSetDynamicTextureDataBlendFace to VeryHigh 2017-06-24 06:11:10 +01:00
UbitUmarov c3dbf91152 osDrawFilledEllipse or string comand FillEllipse identical do Ellipse one 2017-06-24 03:21:23 +01:00
UbitUmarov 3fc6f62c45 Merge branch 'master' into httptests 2017-06-19 03:20:40 +01:00
UbitUmarov fe0fce424c a defual can me comented out 2017-06-19 03:19:55 +01:00
UbitUmarov 4df19ece53 framework main thread pool is always active and in use ( even id hard to catch) so show in on show stats. Disable ServerStatsCollector by default, since most don't use it, Adicionally it uses shared framework performance counters system that may be affected if a region crashs 2017-06-16 18:16:26 +01:00
UbitUmarov 10d526f961 Merge branch 'master' into httptests 2017-06-16 02:43:36 +01:00
UbitUmarov 8e3a50212c remove options about script compilers the got back somehow on defaults also 2017-06-14 16:03:03 +01:00
UbitUmarov ef87370cf1 remove options about script compilers the got back somehow 2017-06-14 15:58:02 +01:00
UbitUmarov 84946e3061 Merge branch 'master' into httptests 2017-06-14 03:04:14 +01:00
UbitUmarov e650a4ff16 remove excessive notion of paralelism 2017-06-13 08:56:21 +01:00
UbitUmarov 25371933b4 update Robust32.exe build files 2017-06-12 20:36:36 +01:00
UbitUmarov 46ba2ead1a add Robust32.exe so recovering the option to run it also in 32bit on windows 2017-06-12 20:28:14 +01:00
UbitUmarov 5e83c2e422 forget about stupid mono 32bit 2017-06-11 19:29:59 +01:00
UbitUmarov 8c5f09f44b actually.. its opensim, use same log file name in 32b mode 2017-06-11 18:56:34 +01:00
UbitUmarov bd2da771a4 remove a ref to old 32bitlauncher 2017-06-11 18:38:54 +01:00
Kevin Cozens 46c8c4854e Set the execute bit on the bin/opensim*.sh files 2017-06-11 13:30:12 -04:00
UbitUmarov 7941f8da23 add opensim.sh and opensim32.sh for linux, replacing old opensim-ode.sh 2017-06-11 18:12:25 +01:00
UbitUmarov 08659811c7 put back opensim 32bit launcher, renamed as OpenSim32.exe. This allows opensim to run in 32bit mode on 64bit machines. Possible most opensim regions should be running like this. 2GB of Virtual memory is still a lot on memory 2017-06-11 13:04:34 +01:00
UbitUmarov b5910cfdb7 merge 2017-06-10 02:48:51 +01:00
Kevin Cozens 3cddfddc3f Minor changes to commented text in bin/OpenSim.ini.example 2017-06-09 10:14:09 -04:00
UbitUmarov 55babdc160 Merge branch 'master' into httptests 2017-05-31 07:21:21 +01:00
UbitUmarov e5991124dd merge LocalNeighbourServicesConnector and RemoteNeighbourServicesConnector in single NeighbourServicesOutConnector 2017-05-31 01:29:38 +01:00
UbitUmarov a2c824e124 get back to .net4.0 for now 2017-05-27 13:56:28 +01:00
UbitUmarov 2603363e3e update test httpserver, be more tolerant on protocols 2017-05-27 12:51:32 +01:00
UbitUmarov 6609965f6e ops no 2017-05-27 06:50:45 +01:00
UbitUmarov d5d09253bc add test cert 2017-05-27 06:47:54 +01:00
UbitUmarov c54985f8a1 Merge branch 'master' into httptests 2017-05-27 05:47:05 +01:00
UbitUmarov 426f2130fc change opensim-ode.sh to use the ode engine defined on opensim.ini 2017-05-26 01:50:54 +01:00
UbitUmarov 2777995331 Merge branch 'master' into httptests 2017-05-25 10:23:52 +01:00
Geir Nøklebye 0d31898fd6 Update macOS version of libode to 0.13.2. The library is build as a fat library with both 32 and 64 bit code. O3 optimization and built with macOS 10.11 SDK. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2017-05-25 05:03:27 +01:00
UbitUmarov 2008e65695 mantis 8780 replace ode bins for linux with ones compiled against older Glibc, Thanks Jak 2017-05-24 21:08:21 +01:00
UbitUmarov 774e00b3ee merge 2017-05-20 17:02:25 +01:00
UbitUmarov 40091f9be5 Merge branch 'master' into httptests 2017-05-19 03:23:57 +01:00
UbitUmarov c5d0c69a35 update libomv LitJSON to version 0.9.0 2017-05-19 02:51:37 +01:00