e9382c2939
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:09:12 +00:00
303c02133f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 23:00:01 +00:00
1c3e77b728
What is the point of using different types to express the same damn thing?
2010-12-21 22:58:52 +00:00
a70b597840
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:57:31 +00:00
19181c019a
Another good catch. Update file name serial.
2010-12-21 22:56:48 +00:00
da37ddff9f
Merge branch 'master' into careminster-presence-refactor
2010-12-21 22:50:35 +00:00
ec8d1d0131
Added a missed return. Thanks diva!
2010-12-21 22:49:38 +00:00
4093e22833
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-21 20:57:52 +00:00
b1180a53dd
Merge branch 'master' into careminster-presence-refactor
2010-12-21 20:56:37 +00:00
a31b96e1ba
Fix up merge artifacts
2010-12-21 20:54:28 +00:00
043dace118
Make prim inventories a bit more sane
2010-12-21 20:49:31 +00:00
c9aa420c2d
Restore CM loking after core extract
2010-12-21 20:48:58 +00:00
2f84f2171f
Make prim inventories a bit more sane
2010-12-21 20:47:00 +00:00
a6a136bd90
Shooting in the dark for solutions to the appearance problem
2010-12-20 14:24:52 -08:00
5fccbe21d6
Update materials parameters.
2010-12-20 07:04:35 +00:00
c082254b9d
Put the coarse location updates back to 50 frames, otherwise the dots on the mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9.
2010-12-19 19:29:07 -08:00
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00:00
711283d3ca
More changes to the long help text for console command link-region.
2010-12-20 02:50:19 +01:00
3b4af8a0dc
Fix osTeleportAgent and osTeleportOwner for the case that GridService is used with a storage provider other than NullRegionData.
2010-12-20 02:09:35 +01:00
2a40c8511a
Make long help text for new link-region command syntax more explicit.
2010-12-19 22:59:32 +01:00
cf72fece6d
Replaced the HttpServer_OpenSim.dll with one compiled for .NET 3.5 (the last one was 4.0, and that doesn't work). Also added the corresponding .xml and .pdb, if that makes any difference.
2010-12-18 18:23:51 -08:00
d576d7c0a6
Replaced HttpServer_OpenSim.dll with a version that locks certain ops in HttpForm -- mantis #5128 .
2010-12-18 17:36:37 -08:00
7a78de8105
fix 'system.exception: unknown type in list.size: system.uint32'
2010-12-18 23:29:49 +00:00
223264047e
uncomment "load iar" help lines which added the --merge option
2010-12-18 00:59:37 +00:00
bf9555eaee
minor: add [-p|--profile=<url>] to usage line that pops up if save iar console command isn't valid
2010-12-18 00:57:09 +00:00
ef43f98686
Raise maximum iar version that master can load to 1.x, so that it can load its own iars (oops)
2010-12-18 00:45:56 +00:00
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +00:00
b32dcc6913
Fix notecards that end with an embedded object causing an exception
2010-12-17 22:50:00 +00:00
5782f5662b
remove now unused subversion serialization backup config
2010-12-17 23:06:55 +00:00
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
3d32f05cde
remove mono compiler warning: if (sop.Color != null) always returns true as sop.Color is a value type.
2010-12-17 22:40:11 +00:00
3b1c91c24b
remove mono compiler warnings
2010-12-17 22:35:08 +00:00
0913d43c50
minor: 'debug packet' console command level <= 50 then don't log ImprovedTerseObjectUpdate messages
2010-12-17 22:29:43 +00:00
19f70b93a0
tidy up the [Groups] section in OpenSim.ini.example
2010-12-17 21:19:57 +00:00
d7622cbedc
Fix notecards that end with an embedded object causing an exception
2010-12-16 21:01:38 +01:00
835e4dbc2c
Add locks on m_killRecord without breaking things like justin did
2010-12-16 20:49:40 +01:00
aebc011f7b
Remove some spam from FreeSwitchModule
2010-12-16 20:12:18 +01:00
4719e925b8
Revert the locking changes in LLCLientView
2010-12-16 20:11:26 +01:00
0745d65344
Put in locks on m_killRecord to replace changed locks on m_entityUpdates.SyncRoot
...
These locks are necessary to avoid a delete/update race condition for scene objects.
However, since we're now locking on m_killRecord this shouldn't cause delays to m_entityUpdates reprioritization
2010-12-15 23:11:42 +00:00
d457b4c4b1
Merge branch 'master' into careminster-presence-refactor
2010-12-15 22:59:52 +00:00
62e66b17bc
Make sure the material is set on physical prims
2010-12-15 17:54:57 +01:00
ee1e725e39
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-15 08:18:02 +01:00
f8beeb1e93
Fix casts in llSetPayPrice
2010-12-15 08:15:12 +01:00
ed26376ec5
Yet more things out of the main Update thread loop and into threadlets. This time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag.
2010-12-14 20:15:26 -08:00
74c68474e0
Another attempt at moving heavy computation away from the Update loop. #LoginLag
2010-12-14 18:44:26 -08:00
e3262ef5ac
Commented out the UpdateLand call from the Update thread loop, because this may be causing the #LoginLag. Attachments taint the prim count. Twice. Each.
2010-12-14 17:50:37 -08:00
eb07dfc900
Fix windows compile break
2010-12-15 01:06:20 +00:00
b643661938
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-15 00:35:36 +00:00
d0576f39e0
replace ode.dll with one built without asserts turned on
2010-12-15 00:35:00 +00:00
6b135ee371
fix mistake in last change of local.include
2010-12-15 00:14:43 +00:00
Melanie