Commit Graph

12124 Commits (6818427f1cafe9bf86265f66cd8dc1d1630e6853)

Author SHA1 Message Date
Melanie 61d6e42af2 Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles 2009-09-30 17:46:04 +01:00
Kitto Flora 07df0e0ab0 Merge branch '0.6.7-post-fixes' into vehicles 2009-09-30 19:07:18 +02:00
Kitto Flora d43f739cef And another merge issue 2009-09-30 19:05:39 +02:00
Kitto Flora 11750a272e And another 2009-09-30 19:04:06 +02:00
Kitto Flora 6b65eb76d0 Another small change to avoid later merge conflict 2009-09-30 19:01:55 +02:00
Kitto Flora 53fbc970ca Small chaneg to adapt to trunk 2009-09-30 18:58:52 +02:00
opensim 827b0fb199 Commit initial version of KittoFlora's vehicle changes 2009-09-30 18:51:02 +02:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
dr scofield (aka dirk husemann) de9be9c80a adding skeleton test case for LandDataSerializer [w-i-p] 2009-09-30 17:00:02 +02:00
dr scofield (aka dirk husemann) 33515c75e4 adding LandDataSerializer (not connected anywhere, work-in-progress)
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
Melanie 1006a2254c Make create user to the Right Thing with regard to salting user passwords 2009-09-30 13:36:03 +01:00
Melanie 377a8b5229 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-09-30 11:17:27 +01:00
Melanie 94aa7e677c Change command help text to show .ini in place of .xml when creating regions 2009-09-30 09:12:43 +01:00
Diva Canto 89016203de Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-29 16:13:31 -07:00
Diva Canto b1d204802f Minor bug fixes. 2009-09-29 16:13:07 -07:00
Justin Clark-Casey (justincc) e9c05cf385 change 0.6.7 candidate branch down to RC1 2009-09-29 21:47:11 +01:00
Justin Clark-Casey (justincc) 74a05ac32b small test change 2009-09-29 21:25:13 +01:00
dr scofield (aka dirk husemann) 09cb8a594b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim 2009-09-29 17:00:02 +02:00
Diva Canto 37a8b2b8b7 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-29 07:56:29 -07:00
Alan M Webb 2a7bedb5e9 This fix addresses the problem where phantom objects do not
always behave like they are phantom, and llVolumeDetect
  seems to operate in a random fashion.

Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 16:55:03 +02:00
Diva Canto bc892c1d4c A little hack to see if this fixes the problems with ~20% of SOG's becoming phantom after an import to megaregions. 2009-09-29 07:54:56 -07:00
Alan M Webb a43706862c Given the perverse way that strided works, if
there is only one element in the range, it must
  also coincide with the specified stride. The
  existing code assumes that the stride starts at
  start ( which is the expected and most useful
  behavior).

Signed-off-by: dr scofield (aka dirk husemann) <drscofield@xyzzyxyzzy.net>
2009-09-29 15:40:41 +02:00
Jeff Ames 77f5e41631 Remove empty CheckSumServer.cs file. 2009-09-29 21:21:53 +09:00
Melanie 691f1e8aa0 Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
2009-09-29 09:56:17 +01:00
Diva Canto 13c6202da9 Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. 2009-09-29 09:50:18 +01:00
Melanie 1096103d66 Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
2009-09-29 09:44:12 +01:00
Diva Canto 6653a30487 Fixed bug in HG that was causing secondlife:// refs to bomb the client.
Also fiddled a bit more with the initial CAP in the user server.
2009-09-28 20:58:21 -07:00
Diva Canto 95981776dd Fixed bug in Check4096 (HG). 2009-09-28 20:11:10 -07:00
Diva Canto f4e8ac3556 Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. 2009-09-28 18:53:07 -07:00
Diva Canto a60ed0562c I think I have fixed something that was broken in the scene setup (tests) and that needs to be reflected in all other services setups. But the teleport test still doesn't work. Commenting it for now. 2009-09-28 17:42:35 -07:00
Diva Canto 51d9f7ebd4 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 17:35:26 -07:00
Diva Canto 4eca59ec13 Improved the Local grid connector to fetch data from the DB when it doesn't find it in the cache.
Commented out the Standalone teleport test because it's failing, and the scene setup is very confusing. I suspect it may be wrong -- the connectors-as-ISharedRegionModules are being instantiated several times when there are several scenes.
2009-09-28 17:33:34 -07:00
Jeff Ames e3217d4840 Convert DOS newlines to Unix newlines. 2009-09-29 08:50:40 +09:00
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Melanie ec464d9e87 More reordering 2009-09-28 23:19:30 +01:00
Melanie 01cfbac040 Reorder prebuild stuff to make panda eat bamboo in peace 2009-09-28 23:13:36 +01:00
Melanie 97c40bcba7 Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim 2009-09-28 23:04:32 +01:00
Diva Canto 7d46b627e2 Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 15:51:07 -07:00
Diva Canto e6ee9785fb Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-09-28 15:48:26 -07:00
Melanie 0709149313 Merge branch 'grid-service-redux' 2009-09-28 23:03:47 +01:00
Melanie fe3760e4a2 Merge branch 'master' into 0.6.7-post-fixes
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
2009-09-28 22:57:38 +01:00
Melanie a1aa362866 Allow the notation config_name@port/dll_name:class_name as a handler spec
in OpenSim.Server.ini
This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll"
The config name is not yet supported by any modules
2009-09-28 22:48:57 +01:00
Diva Canto 276b0a0cbe Forgot a return statement. 2009-09-28 11:17:34 -07:00
Diva Canto 9bdb585a93 Added Protocol versions back, this time in a range model. 2009-09-28 10:56:05 -07:00
Melanie 7cd03abab5 Bump main version to 0.6.8-Dev 2009-09-28 18:41:21 +01:00
Melanie 63c3c7483f Bump version number in post-fixes 2009-09-28 18:38:48 +01:00
Diva Canto 3091e5db9d Fixed bug in user server related to region's serverURI. 2009-09-28 07:53:52 -07:00
Diva Canto 500cd3505a Added RegionSecret to GridRegion, and corresponding saving/retrieval from DB layer. This sounds fishy to me, but it's what's used to make external currency modules work, for now. 2009-09-28 07:20:38 -07:00
Diva Canto 69da82b39f Bug fix in SynchronousRestFormsRequester -- Write instead of WriteLine, which was causing an extra \n to be written into the buffer. 2009-09-28 06:44:57 -07:00
Diva Canto de48113962 Added GridService section to OpenSim.Server.ini.example 2009-09-28 06:08:35 -07:00