41ff39414b
Merge branch 'master' into vehicles
2009-10-01 14:08:15 +01:00
133a4a9906
- adding new LandDataSerializer testcase to "test-xml" target as well
...
- adding another LandDataSerializer testcase
2009-10-01 15:03:16 +02:00
05da73c300
fixing LandDataSerializer (yeah! for testcases)
2009-10-01 12:01:41 +02:00
18416ec518
Merge branch 'oar-parcel' into x-opensim
2009-10-01 10:30:43 +02:00
77ed8e977a
adding meat to the LandDataSerializerTest cases.
2009-10-01 10:30:26 +02:00
5b378a793b
Merge branch 'oar-parcel' into x-opensim
2009-10-01 09:48:30 +02:00
9dcf7da42a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-10-01 09:48:02 +02:00
40cf840df2
adding testcase for LandDataSerializer; fixing LandDataSerializer ;-)
2009-10-01 09:47:45 +02:00
8e3dd64282
Removed an innefficent List.Contains lookup from UpdateQueue
...
Changed the underlying data structure used to detected duplicate
in OpenSim.Region.Framework.Scenes.Types.UpdateQueue from a
List to a Dictionary.
2009-09-30 17:53:32 -07:00
cb26878f96
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 17:51:34 -07:00
606e831ff5
Formatting cleanup.
2009-10-01 09:38:36 +09:00
acfe2d9f4e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-09-30 15:28:23 -07:00
61d6e42af2
Merge branch 'vehicles' of ssh://opensim@tor.k-grid.com/home/opensim/opensim into vehicles
2009-09-30 17:46:04 +01:00
07df0e0ab0
Merge branch '0.6.7-post-fixes' into vehicles
2009-09-30 19:07:18 +02:00
d43f739cef
And another merge issue
2009-09-30 19:05:39 +02:00
11750a272e
And another
2009-09-30 19:04:06 +02:00
6b65eb76d0
Another small change to avoid later merge conflict
2009-09-30 19:01:55 +02:00
53fbc970ca
Small chaneg to adapt to trunk
2009-09-30 18:58:52 +02:00
827b0fb199
Commit initial version of KittoFlora's vehicle changes
2009-09-30 18:51:02 +02:00
ee205e7e81
Formatting cleanup.
2009-10-01 01:17:47 +09:00
de9be9c80a
adding skeleton test case for LandDataSerializer [w-i-p]
2009-09-30 17:00:02 +02:00
33515c75e4
adding LandDataSerializer (not connected anywhere, work-in-progress)
...
[hi, there, justin!]
2009-09-30 16:19:39 +02:00
1006a2254c
Make create user to the Right Thing with regard to salting user passwords
2009-09-30 13:36:03 +01:00
377a8b5229
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-30 11:17:27 +01:00
94aa7e677c
Change command help text to show .ini in place of .xml when creating regions
2009-09-30 09:12:43 +01:00
89016203de
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 16:13:31 -07:00
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
e9c05cf385
change 0.6.7 candidate branch down to RC1
2009-09-29 21:47:11 +01:00
74a05ac32b
small test change
2009-09-29 21:25:13 +01:00
09cb8a594b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
2009-09-29 17:00:02 +02:00
37a8b2b8b7
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-29 07:56:29 -07:00
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
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
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
77f5e41631
Remove empty CheckSumServer.cs file.
2009-09-29 21:21:53 +09:00
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
13c6202da9
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-29 09:50:18 +01:00
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
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
95981776dd
Fixed bug in Check4096 (HG).
2009-09-28 20:11:10 -07:00
f4e8ac3556
Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer.
2009-09-28 18:53:07 -07:00
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
51d9f7ebd4
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 17:35:26 -07:00
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
e3217d4840
Convert DOS newlines to Unix newlines.
2009-09-29 08:50:40 +09:00
f00126dc2d
Add copyright header. Formatting cleanup.
2009-09-29 08:32:59 +09:00
ec464d9e87
More reordering
2009-09-28 23:19:30 +01:00
01cfbac040
Reorder prebuild stuff to make panda eat bamboo in peace
2009-09-28 23:13:36 +01:00
97c40bcba7
Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensim
2009-09-28 23:04:32 +01:00
7d46b627e2
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-28 15:51:07 -07:00
Melanie