Commit Graph

218 Commits (1aecd0372b04062a2dffa0759c8e9f40c151bddc)

Author SHA1 Message Date
MW 98705e6211 Changed to slightly better textures for the map: a blue one for the sea and one that if you stand at least 10 feet away from the screen and strain your eyes a bit and have really bad vision could maybe look like a island. 2007-05-13 12:48:42 +00:00
MW 05d9593198 Added very basic support for maps (likely to only work in sandbox mode due to the non functioning remote asset server), also currently just uses textures that we already had added to the asset server (this is the first thing that needs fixing) 2007-05-13 12:25:08 +00:00
Adam Frisby bd05850be1 93 warnings in the compiler, 93 warnings appear, you fix one up, create two more, 94 warnings in the compiler... 2007-05-12 15:32:04 +00:00
MW d663dfa3bd Increased the flying speed 2007-05-12 10:12:34 +00:00
morphw 0d52bc723d Added landmark asset creation. 2007-05-11 21:03:11 +00:00
MW f016e8675b finally some time to do some more work on the primitive2 refactor/rewrite/bugfix. 2007-05-11 10:55:32 +00:00
MW 26002559c0 Fixed bug where client crashes on login if in sandbox mode and region is set to anything other than 997,996 2007-05-08 16:40:20 +00:00
lbsa71 9f881f90d3 * added guid to logname to avoid file sharing on multiple instances on same host 2007-05-08 14:37:04 +00:00
lbsa71 72159dc5a8 * fixed dataUri null bug
* ignored some files
2007-05-08 14:16:01 +00:00
lbsa71 0b26ae44ac * deleted bin directories
* ignored bin directories
* regenerated nant files
2007-05-08 11:09:48 +00:00
gareth 3de3d8bb3b Merged 0.1-prestable back into trunk :( 2007-05-07 16:32:30 +00:00
gareth 543cda0398 Cleaned up Adam's mess 2007-05-05 13:45:39 +00:00
Adam Frisby 5eacce71ad * Removed superfluous int to prevent warning
* Changed OGSServer on RegionServer to bind to <port> - 500 rather than a single fixed port
* Added support for the grid server to tell us who we are (optional)
2007-05-04 07:43:07 +00:00
Adam Frisby d12c2be492 Sims can now load their datastore (their localworld class - prims/terrain/etc) from a file indicated by the grid server. This allows you to have a floating pool of regions tasked to whichever region they need to be at any time. 2007-05-04 07:23:41 +00:00
MW a595881dc0 fixed the VS 2005 solution/ project files.
and a couple of other small changes
2007-04-30 15:38:51 +00:00
gareth 328c9ccb24 Copied gridserver ready to convert to asset server
I'M THAT NUTS!!!!!!!!
2007-04-29 23:58:57 +00:00
Adam Frisby 6c7ebf19b5 Bugfixes 2007-04-28 00:32:00 +00:00
Adam Frisby 8f5c96f02b Dumb mistake #2 2007-04-27 22:29:29 +00:00
Adam Frisby fadb4a9dcc Dumb mistake - forgot to assign the datastore variable 2007-04-27 22:26:57 +00:00
Adam Frisby 6ce5b6e439 Major ass commit
Added new "Datastore" parameter to simconfig.xml which is passed to storage engines via a new Initialise() function.
2007-04-27 21:11:02 +00:00
Adam Frisby feca5d22c6 * Added new commandline option -config <configfile.xml>
Note: This is untested but is a very simple change and should 'just work'. If someone can test, appreciated.
2007-04-27 20:32:02 +00:00
MW 14a4ff3081 added just what opensim needs...yet another command line option: -noverbose . cut down on the system console output (should really be stopping it all but not all output is going through OpenSim.Framework.Console) 2007-04-26 17:50:25 +00:00
MW a7c374ac51 At last: avatar-template.dat is no more 2007-04-26 17:29:41 +00:00
MW c64039363d Mostly working again.
Updated to lastest libsl and handled the changes to the message templates (some byte fields are now ushort fields ).
Still seems to be a problem when logging on, in that I get the downloading clothing message at the end of the precaching (which I didn't before)
2007-04-26 12:56:14 +00:00
MW f06d0f1047 attempted bug fix 2007-04-25 18:48:08 +00:00
MW 9ed0a8dbad updated to use lastest version of libsl but is currently broke when using SL viewer 1.15.02, due to big changes in the message templates. 2007-04-25 18:12:06 +00:00
MW 68b33294b1 Can now use the xml config file for setting up things like sandbox mode, login server, physics engine etc. To use this mode add just -configfile to the startup line (instead of the -sandbox etc)
A example of what to add to the xml is: SandBox="true" LoginServer="true" UserAccounts="false" LocalAssets="false" PhysicsEngine="basicphysics"  (add those to config node in simconfig.xml). 
The current options for PhysicsEngine are : basicphysics, RealPhysX, OpenDynamicsEngine.
2007-04-25 13:47:32 +00:00
MW f7b51d63a8 Small clean up of files and directories 2007-04-25 13:03:48 +00:00
Adam Frisby 7dd98f3094 Moved console input-handling function "RunTerrainCmd" into BasicTerrain itself, this allows independent versions of BasicTerrain to have different functionality exposed directly. 2007-04-24 18:01:37 +00:00
Adam Frisby d82466ec82 Added mutex instead of lock for update 2007-04-22 18:51:03 +00:00
Adam Frisby 2194b74473 Needs testing.
1. Fixed Update Lock (should now compile)
2. Added support for rescaling a primitive without it jerking to the side.
2007-04-22 18:48:45 +00:00
Adam Frisby 6103e06a34 Added lock around World.Update to prevent multiple updates occuring simultaneously (it happened!) 2007-04-22 18:00:01 +00:00
Adam Frisby 869b39c451 SimClient: Added Try/Catch over block of code which is triggering an exception that should not be triggerable. (Duplicate key after dictionary is locked, checked for key, then added) [!?!?]
AvatarUpdate: Added check for if the physics actor is null before attempting to access it.
2007-04-22 17:31:51 +00:00
lbsa71 60047aa5a6 === Dedicated to Jesse. ===
* Deleted empty directory
2007-04-22 09:44:27 +00:00
gareth b0dfd5602a Now starts up a laggy (to be fixed) TCP server in grid mode and sends a banner
NEED THREAD POOLS!!! DO NOT LET ME GET AWAY WITH BEING LAZY PEOPLE!
2007-04-22 05:40:00 +00:00
Adam Frisby c1f34105fa Bumped avatar entry height to 15m above ground rather than the old 1m above ground. Should prevent 'below ground' arrivals. 2007-04-22 04:49:12 +00:00
Adam Frisby 77723fbda1 Removed last references to ancient LandMap[] array. 2007-04-22 03:28:58 +00:00
Adam Frisby cb2e495202 Commented first 50% of World.cs's functions with /// tags 2007-04-22 03:25:18 +00:00
Adam Frisby 0b54136042 Small fix 2007-04-22 03:16:26 +00:00
Adam Frisby c6b1dd0fac Added exception handling to each function in World.cs - code is assumed stable so MSVC debugging of this code should no longer be needed. If however, it is needed, put a breakpoint on the exception handler concerned. 2007-04-22 03:15:22 +00:00
gareth 1dfda8f744 Added OpenGridProtocol class - start of the new TCP-based intersim protocol, very basic skeleton
First commit since we lost JesseMalt - Dedicated to their memory
2007-04-21 17:36:03 +00:00
Adam Frisby 2844c56ef4 Terrain / Physics / Storage:
* Added terrain "taint" - if terrain is tainted, the terrain is marked as needing to be saved.
* Added check for taint in the Backup() routine, if taint is found, terrain is saved and physics engine is notified.
2007-04-21 05:51:10 +00:00
Adam Frisby 9990bf4826 Config:
* Added sane defaults to each configuration step. (The defaults for sim/user/grid will now create a working grid)
2007-04-21 05:09:06 +00:00
Adam Frisby 984235c622 Terrain:
* Added 'multiply' command since rescale doesnt exactly do what Adam wants.
2007-04-20 14:53:38 +00:00
Adam Frisby ae8824985c Terrain:
* Added 'rescale' command for normalising a terrain between two values
2007-04-20 14:49:24 +00:00
MW 84700807c7 Hopefully fixed the forward slash bug in the gridurl set up 2007-04-20 13:44:17 +00:00
Adam Frisby 258e62679a Console:
* Reorganised and added default handlers to main functions
* Removed "regenerate" command, use "terrain regenerate" instead.
* Added new "terrain seed" command to set the random seed
* Added new "terrain load" command to load a terrain from disk
* Added new "terrain save" command to save a terrain to disk
Terrain:
* Added new export and import functions for some common formats
* Added new setSeed function to allow customising the random seed
2007-04-20 05:39:01 +00:00
MW ec790b8876 2007-04-17 19:49:58 +00:00
MW 631d30b80d Yet another command line option (really need to get all these moved into a config file), this one: "-localasset" (without the quotes) is a temporary hack to use a local asset server when in grid mode. (use with extreme caution if you have more than one sim in a grid) 2007-04-17 13:39:21 +00:00
MW 2180bdf64a Hopefully undid the murder I committed in the last commit 2007-04-17 12:25:20 +00:00
MW d5406fe773 A few fixes and stopped sim crossing being attempted in sandbox mode 2007-04-17 12:03:52 +00:00
gareth 3e86870f7f Created skeleton SimComms.cs for sim<->sim UDP circuits
Fixed bug with <0,0> co-ordinates on sim crossing
2007-04-17 10:53:50 +00:00
gareth bbcb20e192 Sim crossing now works (except for broken co-ordinates, resets to 0,0 - to be fixed soon)
Fixed sandbox mode fully
Scrapped former XML-RPC expect_user call for sim crossings
Sim client thread can upgrade/downgrade between full and child agent dynamically
2007-04-17 01:38:20 +00:00
MW 990680027f Started to fix sandbox mode 2007-04-15 09:45:34 +00:00
gareth 7f0ecec464 unbroke sandbox mode 2007-04-15 02:50:09 +00:00
gareth f9b7cc53de W00t! multiple sims!
Misc bugfixes
Child agents!!!!!!
General sexy stuff
2007-04-15 02:31:34 +00:00
gareth dd5f4abdb9 Fixed weird XML/HTTP bugs
Can now update a sim profile at startup automatically! W00t!
Untested neighbours code (for sim crossings)
Didn't drink any red bull today :( Used liquid guarana extract + cola
2007-04-13 15:14:21 +00:00
gareth cc53580ba4 aaaaaaarrrrrrrrrggggghhhhhhhh why oh why? 2007-04-12 18:34:17 +00:00
lbsa71 1a28ef6292 * Replaced GridHTTPServer and UserHTTPServer with BaseHttpServer
* Now dumping default value in config.
*
2007-04-11 20:07:58 +00:00
lbsa71 08d5d10d62 * Started on converting UserHTTPServer to BaseHttpServer
* Added a 'param' param to the RestMethod
* Added RestHandlerEntry to store more info about the 'rest' handler
2007-04-11 14:14:19 +00:00
MW bea8e2b826 Renamed the Servers directory to OpenSim.Servers 2007-04-11 13:40:29 +00:00
MW 2f3b6c4b10 small improvement to the jvm and test script 2007-04-11 12:49:00 +00:00
MW 5ad6d5a939 First basic test script now works in the jvm scripting engine.
For it to work you need to have a java sdk installed and the javac.exe somewhere in the environment Path variable.
Then To test, copy the text from bin/script1.text into a note card and then add that note to a prim.
2007-04-11 12:13:21 +00:00
MW ffd7a6b8c2 Changed so that a bin\ScriptEngines\ directory will be searched for scripting Engines.
Added the work in progress JVM scripting engine.
2007-04-11 09:45:48 +00:00
MW 435d61661b 2007-04-11 09:29:06 +00:00
gareth 950389a263 Added POST handler for /sims/ in the grid server
Removed asset/user config in grid mode in the region server
Added "create user" command in the user server console
Begun buggy code to send sim details to the grid at startup
Drank whole pack of red bull in one night and made stupid jokes in SVN logs and C# comments
2007-04-11 08:51:39 +00:00
lbsa71 8f5919bf63 * nant building again 2007-04-11 07:57:03 +00:00
lbsa71 1747d49d71 * built binaries, pdb's and user files should not be under version control.
* updated vs2005 and nant targets
* added some build files
* ignored some binaries, pdb's and user files
2007-04-11 07:33:14 +00:00
Adam Frisby adb56a46f4 Major ass changes to terrain (now uses libTerrain-BSD!) and all-round improvements to code quality. Terrain saving/loading may work now (running through setHeights1D and getHeights1D before DB4o) **WARNING: UNTESTED** 2007-04-11 05:19:27 +00:00
MW 03f5ff9dc2 2007-04-10 10:45:46 +00:00
gareth 34d91c31cf And now clothes update and show for all users
woohoo!
2007-04-10 02:03:47 +00:00
gareth 632db47dd7 Fixed avatar appearance not updating issue as per bug report #79 2007-04-10 01:43:40 +00:00
gareth 868f184f23 Avatar now stands still and does the normal animation stuff 2007-04-10 01:23:03 +00:00
gareth ea84e93679 Fixed "teh bug" 2007-04-10 00:43:11 +00:00
Adam Frisby 4ab5803911 Documentation! 2007-04-07 17:37:04 +00:00
MW 0879e6427e compiles and works just weird terrain problem (and terrain saving is currently not functional) 2007-04-06 19:25:29 +00:00
MW 0311fef244 Now back to compiling, just no terrain generation at the moment 2007-04-06 19:08:24 +00:00
Adam Frisby fb0dffbf13 **BREAKING CHANGE** Changing the way terrain is stored and used internally. 2007-04-06 18:48:23 +00:00
MW 802d443be8 very very few changes, but just commiting so that svn it upto date with my local version. And also to keep robl^ happy that a commit has been made. 2007-04-06 13:04:46 +00:00
MW 0a377238f8 more work on Primitive2 2007-04-04 19:55:31 +00:00
gareth 7c2b4d1c9d no SimUUID in OpenSimMain 2007-04-04 19:20:17 +00:00
gareth f741e00ad8 Added SimUUID
Added empty POST for /sims in REST on gridserver
2007-04-04 18:57:13 +00:00
MW d3766d0aef Deleted OpenSim.Config/SimConfigDb4o, as it hasn't been used for a while now.
Split World class into two partial classes
2007-04-04 18:26:33 +00:00
MW 76df9e626d Split Avatar class into three partial classes (hopefully will make it easier to work on) 2007-04-04 16:31:35 +00:00
lbsa71 74484ed2ed * Added Primitive2 to vs2005 solution (again) 2007-04-04 14:56:09 +00:00
MW 0ad017677b Seems that I didn't actually include the Primitive2.cs file in the earlier commit. 2007-04-04 14:13:49 +00:00
lbsa71 85385c958a * Added Primitive2 to vs2005 solution
* Apparently, Prebuild thinks DEBUG should be in there.
2007-04-04 13:27:13 +00:00
MW a70ef1c2cb Started to clean up/ rewrite Primitive class , currently the new version is called Primitive2 and not used, but once it is complete then it will replace the old version. 2007-04-04 11:06:39 +00:00
gareth 5e81e7ed9d Finished initial sim<>Grid login (kinda)
Can login but no config data sent/updated yet
2007-04-03 20:39:28 +00:00
lbsa71 f12ceff692 * The world can not contain ScriptFactories that creates unique instances of scripts for entities.
* Created Scripts folder to house trusted Scripts
* The test script now lives in Scripts/FollowRandomAvatar.cs
2007-04-03 20:08:30 +00:00
lbsa71 7169acc47e * Extended Script API with GetRandomAvatar
* The script will now get a IScriptEntity to it's host object with get/sets
* The script gets a IScriptReadnlyEntity interface to entities other than the host object.
* the test script now follows a random avatar.
2007-04-03 19:12:07 +00:00
MW 6d8dcd1d1d Another temporary bug fix attempt, this time for the packet overflow problem, changed it so for now, packets are ACKed straight away in one PacketAck Packet for each ACK. 2007-04-03 18:47:10 +00:00
MW 73380ed52b attempt at a temporary fix to the shirt creation bug. (Its only temporary as I think the real problem is a deeper one) 2007-04-03 18:25:43 +00:00
MW 9b2a4e8172 Added easier way to add "scripts" to prims: to add Libsa71's test script, create a new note and delete the contents of the created note and then add "<Script>Test</Script>" (without the quotes) , then save that and then drag it from your inventory to the prim you want to add the script to. 2007-04-03 18:15:11 +00:00
lbsa71 ad39897144 * Script prototype 2007-04-03 16:50:17 +00:00
MW ba2c94721c Limited (hacked) object linking. Note: once you have linked a set of prims together (in one go), then don't try to link anymore prims to those objects. 2007-04-03 16:10:00 +00:00
MW 56e6587c9f Temporary fix for the object taking bug 2007-04-03 13:37:11 +00:00
MW fdc9ed89b4 OpenSim no longer uses OpenSim.Config.SimConfigDb4o, it now uses OpenSim.GenericConfig.Xml (or a class implementing IGenericConfig). 2007-04-02 15:48:01 +00:00
MW 23ecc07caa Added OpenSim.GenericConfig.Xml project, so we can swap to a more generic configuration method, so that it is easier to load configuration data from a ogs server 2007-04-02 12:56:35 +00:00
gareth 8b81f8d593 Added /simstatus REST handler 2007-04-02 12:35:21 +00:00