e4f143fb1c
Merge branch 'master' into careminster-presence-refactor
2011-03-21 07:57:56 +00:00
f4a30f3a23
Upgrade SQLite:
...
Fixes metadata issues. Tested on Linux and Windows - may fix
issues seen on OSx as well.
2011-03-18 12:12:08 -04:00
9165a5207d
Merge branch 'master' into careminster-presence-refactor
2011-03-10 07:14:03 +00:00
9456bb77fb
Upgrade nunit.framework.dll to version 2.5.9. Fix up tests appropriately.
...
This version removes the NUnit.Framework.SyntaxHelpers namespace, so any modules with their own tests will need to delete this using statement.
2011-03-09 23:25:24 +00:00
3e5b1a1de5
Update MySql.Data.dll to version 6.3.6.
...
This version fixes a bug so that MySqlCommand.CommandTimeout = 0 now correctly sets an infinite command timeout. This might help with failures on long-running migrations.
The mysql.data.dll v2 is used from the mysql package (as opposed to v4). The v4 version (probably standing for NET 4.0) does not work under mono 2.6.7, which is still commonly used.
2011-03-09 20:55:44 +00:00
9be1d2aef1
Merge branch 'master' into careminster-presence-refactor
2011-02-24 02:37:21 +00:00
5a16fa882c
Parameterizes the view distance used to compute and manage
...
child agents in neighbor regions. This means you can extend
the view on a simulator beyond the default 3x3 regions.
This uses a region default draw distance and should be
replaced at some point by the avatar specified draw distance.
That will require more careful, dynamic recomputation of child
agents every time the draw distance changes.
WARNING: this is experimental and has known instabilities. specifically
all regions "within site" should be running the same default draw distance
or agents will not be closed correctly.
2011-02-22 13:23:54 -08:00
4834b47679
Merge branch 'master' into careminster-presence-refactor
2011-02-19 01:59:49 +00:00
5c15c5e0ff
Changed default directory for storing map tile images from remote regions.
2011-02-16 18:36:40 +01:00
ccd6e5d071
Merge branch 'master' into careminster-presence-refactor
2011-02-16 02:41:49 +00:00
5d6d0aa142
Catch HttpServer exception: mantis #5381
2011-02-15 08:38:37 -08:00
059e9eaf98
Fixed a couple of tests in the HttpServer. Not sure if this is enough. Mantis #5373 and #5384
2011-02-12 14:38:46 -08:00
754c244f46
In SQLiteSimulationData.RemoveLandObject(), don't manually remove the row from the data adaptor's Rows list in addition to calling Delete.
...
This matches the behaviour for other deletions and stops this operation failing on Windows .NET (though mono is fine with the duplication).
Probably a holdover from copying code from the older legacy adaptor.
Resolves http://opensimulator.org/mantis/view.php?id=5361
2011-02-11 23:06:14 +00:00
e2762a68b3
Merge branch 'master' into careminster-presence-refactor
2011-02-12 00:42:10 +00:00
98af0db8c0
minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting
2011-02-11 22:16:53 +00:00
3889e68c54
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
OpenSim/Services/GridService/HypergridLinker.cs
2011-02-07 22:08:53 +00:00
f5a3eb9fd5
Added a config var to HGInventoryAccessModule called OutboundPermission that controls whether the sim lets asset POSTs happen to foreign grids or not. It's True by default. If ppl want to allow foreign visitors but don't want to allow any assets out of their grid, they should set this to False. This is the beginning of policies for these things...
2011-02-04 17:05:45 -08:00
c1665cfe9c
Make UUID 3a367d1c-bef1-6d43-7595-e88c1e3aadb3 reference a full alpha texture.
...
SL's viewer and some downstream projects assume that this UUID points to a full alpha texture, as per
http://opensimulator.org/mantis/bug_view_advanced_page.php?bug_id=4751 and
http://forums.kokuaviewer.org/viewtopic.php?f=8&t=1323
If the request isn't satified, some viewers will continuously make the request.
2011-02-03 22:34:10 +00:00
24a768a99b
Merge branch 'master' into careminster-presence-refactor
2011-01-29 04:47:32 +00:00
810f4b9835
Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini
2011-01-28 22:07:35 +00:00
8074c6ace1
Revert "Replace the new, tricky MySql.Data.dll with the older version from 0.6.9"
...
This reverts commit e5ce59ff34
2011-01-14 14:54:28 +01:00
d60ddfdfcb
Revert "Remove old guids from the examples, for completeness' sake"
...
This reverts commit 52222d82d5
2011-01-14 14:54:14 +01:00
3fc5b6a8ec
Merge branch 'master' into careminster-presence-refactor
2011-01-13 19:53:44 +00:00
69c8cc787f
Make FireAndForgetWrapper a singleton class
...
Made FireAndForgetWrapper a singleton class to allow us to drop
dependancy on the BclExtras35 library. BclExtras is broken in
Mono 2.8.2 and we used the library in only one function.
2011-01-13 19:52:34 +00:00
52222d82d5
Remove old guids from the examples, for completeness' sake
2011-01-11 15:07:04 +01:00
e5ce59ff34
Replace the new, tricky MySql.Data.dll with the older version from 0.6.9
...
This requires REMOVING the "Old Guids=true" fromt he MYSQL connection strings!
Sorry for the inconvenience, but this version of the DLL is much less buggy
than the new one for production use.
2011-01-11 14:35:21 +00:00
df7fb207a8
Moved the map tile processing used by the Simian Grid
...
Frontend into a separate region module. Configuration
settings added to the defaults ini file. Others may find
this useful for pushing map tiles to a separate server.
2011-01-08 13:33:07 -08:00
3b50066ceb
Merge branch 'master' into careminster-presence-refactor
2010-12-30 01:40:38 +00:00
f801d50a8a
WARNING: simulator config var change! This affects only system-facing configs. Nothing to do if you follow the rules of not messing with Grid.ini and GridHypergrid.ini.
...
Change the remote Grid region module so that it takes the network connector as a config variable. This allows the region plugin to be reused for both Robust and Simian network connectors.
2010-12-27 15:25:08 -08:00
11eabf0e51
Merge branch 'master' into careminster-presence-refactor
2010-12-20 02:49:31 +00: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
a82112a47c
Merge branch 'master' into careminster-presence-refactor
2010-12-17 22:50:25 +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
19f70b93a0
tidy up the [Groups] section in OpenSim.ini.example
2010-12-17 21:19:57 +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
354f568508
Merge branch 'master' into careminster-presence-refactor
2010-12-14 23:58:45 +00:00
9a24c0b41c
Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
...
Configuration option AssetService in section [GridService] must be set to enable this functionality.
Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270 .
2010-12-13 21:20:48 +01:00
d2ff4ebf2d
Merge branch 'master' into careminster-presence-refactor
2010-12-13 20:19:10 +00:00
8ea4933742
Fixed wrong configuration variable names.
2010-12-11 18:17:07 -08:00
28022a9198
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:22:50 +00:00
8aa63093b1
Merge branch 'master' into careminster-presence-refactor
2010-12-12 01:20:46 +00:00
3ef9a4da9a
update libode for 64 bit linux to r1755 (post 0.11.1) from ode 0.10.1
...
the same thing was actually done for ode.dll a couple of commits ago but I got the commit msg wrong (should have been r1755, not r1754). Damn these fat fingers.
2010-12-10 03:51:33 +00:00
3675bb2981
Make configs consistent, as per mantos #5258
2010-12-09 09:30:17 -08:00
e9e544ddc8
Update ode.dll to r1755
2010-12-09 03:17:41 +00:00
0f240a9f7c
Update ode.dll to r1754
2010-12-09 03:16:37 +00:00
3de0749aa7
Update libode.so to r1755.
...
This revision dates from 02 Sep 2010 and has received some testing. This code will be updated in the opensim-libs repository
Updates for libode-x86_64, ode.dll and libode.dylib will follow
2010-12-09 03:10:48 +00:00
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
c8f0c8ebc4
Remove old Freeswitch configurations
2010-12-07 15:24:17 +00:00
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
f1a7847532
Deleted obsolete config files from old OpenSim.Grid.
2010-12-01 16:19:27 -08:00
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
b43a01179e
Correct an error in Robust.ini.example
2010-11-21 21:35:31 +00:00
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
c4eb430ad2
Merge branch 'master' into careminster-presence-refactor
2010-11-16 21:15:15 +00:00
2368aab534
Fix: Write asset data into Asset.db when using SQLite
2010-11-13 00:31:02 +00:00
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
e76980bc49
Fix config items. Less used / expert items go in OpenSimDefaults.ini
...
The default shown is always the hardcoded default
2010-11-03 01:12:52 +00:00
1f77f05f02
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:12:48 +00:00
c285f87702
Fix config items. Less used / expert items go in OpenSimDefaults.ini
...
The default shown is always the hardcoded default
2010-11-03 01:09:42 +00:00
d5d0e81df2
Admin Server can now bind to a private ip address
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-03 01:09:38 +00:00
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +00:00
e98d8d500f
Fix logins and avatar appearance. Contains a Migration. May contain nuts.
...
This will cause visual params to be persisted along with worn items. With
this, alpha and tattoo laters will be saved. Multiple layers MAY work, but
not tested because I don't use Viewer 2.
2010-10-30 19:06:47 +01:00
4a24bf74d9
* Thank you lkalif for fixing the {array[array[]]} json OSD serialization issue.
...
* This is libOMV SVN revision 3463.
2010-10-30 02:06:43 -04:00
63bdfb1e28
Clarify comment for configuration option Check4096 and show the default value.
2010-10-30 03:01:27 +01:00
343c894658
Set async_packet_handling = true by default
...
Setting this to true avoids a 500ms or so client freeze when the LLUDP server thread is taken up with processing a UseCircuitCode packet synchronously.
Extensive testing on Wright Plaza appeared to show no bad effects and this seems to reduce login lag considerably.
Of course, a lot of login lag is still coming from other sources.
2010-10-30 01:35:12 +01:00
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +01:00
4f39329d6f
Rename the new default texture to be consistent with the others
2010-10-29 21:10:19 +01:00
32e5bee3a7
Add a default alpha layer
2010-10-29 21:09:31 +01:00
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
e6fe83cd93
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This work conflicts with cmickeyb's more extensive, related work
This reverts commit 9c829c0410
2010-10-29 20:17:59 +01:00
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
2010-10-29 20:34:53 +02:00
bd4e3b0aaf
Add a default alpha layer
2010-10-29 20:31:17 +02:00
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01:00
c74c1620a1
* Updated libomv to r3461
...
Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds.
2010-10-24 23:51:46 +01:00
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30:46 +01:00
7fa3335fd5
initial support for meshies physics. Must set ini option UseMeshiesPhysicsMesh = true to enable. See file OpenSimDefaults.ini for example.
2010-10-18 04:17:36 -07:00
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01:00
e039a8c8c2
UPdated the MySql driver to 6.2.4. Also established a much larger MySqlCommand timeout on fetching prims.
2010-10-15 15:43:06 -07:00
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
b4c54765d2
libomv update to support headerless llsd binary deserialization needed for mesh asset decoding
...
Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com>
2010-10-14 21:26:26 -04:00
69dbfe2a69
Updated to libomv-opensim r3449
2010-10-14 15:46:36 +02:00
46738bbd16
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Conflicts:
bin/OpenSimDefaults.ini
2010-10-13 20:29:55 -04:00
1a57c65810
* Normalizing endlines so git stops complaining about them being inconsistent.
...
* People will hate me for updating OpenSimDefaults.. but meh. Gotta be done or git is unhappy.
2010-10-13 20:26:46 -04:00
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01:00
b4c718f93b
Remove carriage returns from OpenSimDefaults.ini. Correct one typo. Change
...
.ini.example ";;" format to normal ini format, since the defaults file
is not parsed that way.
2010-10-13 17:07:13 +01:00
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
78f6fe0b31
Added missing sections to StandaloneHypergrid.ini
2010-10-09 09:09:16 -07:00
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01:00
1e66f79a4e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-08 03:09:04 +01:00
0d9c94033d
move CacheSculptMaps ini flag to OpenSimDefaults.ini
...
comment it and change defailt to true to reflect code
2010-10-07 19:48:17 -07:00
9391c3ffee
add a flag in OpenSim.ini.example for enabling/disabling decoded sculpt map caching for meshing
2010-10-07 19:34:46 -07:00
12bc6a7414
Clarify the format comment at the top of OpenSim.ini.example
2010-10-08 03:08:05 +01:00
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +01:00
07122614d5
Formatting cleanup.
2010-10-04 22:44:22 -04:00
eeca0ee009
Formatting cleanup.
2010-10-04 17:10:07 -04:00
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01:00
0e7e92b67f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-04 04:49:09 +01:00
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
67cfde3fb4
Added Meshmerizer rendering plugin for libomv
2010-10-04 04:48:42 +01:00
adc3cfdcdc
Removed linden renderer
2010-10-04 04:44:33 +01:00
940246f2d5
Use libomv 0.8.4.3445
2010-10-04 04:44:16 +01:00
934ae03d44
Made the Gatekeeper proxy-able.
2010-10-03 20:35:26 -07:00
c19ac997b1
Merge branch 'master' into careminster-presence-refactor
2010-10-04 01:08:11 +01:00
be301c5815
Add the matching PrimMesher.dll
2010-10-04 01:04:38 +01:00
eb0cde7959
Replaced OpenMetaverse dlls with ones compiled in Windows.
2010-10-03 17:08:09 -07:00
6ba7ee6b2e
Update libOMV
2010-10-04 00:44:27 +01:00
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
50b03d08a8
Add linden prim renderer and update libOMV
2010-10-04 00:04:42 +02:00
48988bf4e9
Merge branch 'master' into careminster-presence-refactor
2010-10-03 22:38:32 +01:00
72c1b09d57
Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex.com/
2010-10-03 10:35:53 -07:00
bda02da152
Add the Warp3D dll
2010-10-03 16:58:22 +01:00
b4fe6da4eb
Add the Warp3D dll
2010-10-03 16:57:45 +01:00
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +01:00
ffc1123ca5
adding -logconfig to Robust.exe
...
Adding -logconfig to Robust.exe. will still process the
-logfile option, as before. No options given, the value
"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
14db53b723
Another typo fix
2010-09-26 18:35:15 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
8afa21cef0
Some cleanup to OpenSimDefaults.ini
...
Fixing a couple of errors
2010-09-26 17:00:56 +01:00
51e03617e9
Changes to preceding patch to make it conform to inifile formats. BLANK LINE
...
before each comment/option group, and DOUBLE SEMICOLONS before pure text
comments in OpenSim.ini.exemaple
2010-09-26 02:31:37 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
33ae5ad309
* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.
2010-09-23 00:50:18 -04:00
58f7a083f9
Add LandServices to make landmarks work right in grids
2010-09-17 22:06:43 +01:00
9f7aa7deef
Add LandServices to make landmarks work right in grids
2010-09-17 21:40:49 +01:00
58b1ee8e2c
Merge branch 'master' into careminster-presence-refactor
2010-09-16 18:04:50 +01:00
f5e3d5a33a
Add the modules include line back that i dropped by mistake
2010-09-15 23:24:58 +01:00
c1ccfa6d8d
Mark up OpenSim.ini.example for use with an automatic configuration tool.
...
Remove seldom changed options from OpenSim.ini.example.
Remove non-overridable settings like [Architecture] from OpenSimDefaults.ini
2010-09-15 20:29:28 +01:00
0d034712ba
Make AuthorizationService optional and disabled by default. It depends on
...
external PHP and the default configuration makes it throw for not
having a URL to this PHP
2010-09-15 15:56:03 +01:00
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +01:00
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
2010-09-14 03:30:07 +01:00
95702129c7
Revert "Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't"
...
This reverts commit fc48eb7b54
2010-09-14 03:07:41 +01:00
c3259e9c26
Move OpenSimDefaults,ini into config-include in order to put it with all the other default files
2010-09-14 01:38:53 +01:00
fc48eb7b54
Repopulate OpenSim.ini.example with OpenSimDefaults.ini until somebody does the work of deciding what users commonly change and what they don't
2010-09-14 01:30:12 +01:00
51411d5664
add the missing ini example
2010-09-14 00:32:49 +01:00
1654e27cda
Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini
2010-09-13 16:23:22 -07:00
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
2cf98e77fc
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:27:47 +01:00
8e51ca3a7b
Output an error and quit if the master file is missing. Also rename
...
OpenSim.ini.example to bin/OpenSimDefaults.ini.example
2010-09-13 23:17:42 +01:00
2ed276eb47
Adding missing ConnectionString lines to [DatabaseService] sections for SQLite configs
2010-09-13 11:39:58 -07:00
6a1ce17cdb
Merge branch 'master' into careminster-presence-refactor
...
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
0db1ed0b5a
* Added ISimulationDataService and IEstateDataService
...
* Removed StorageManager
* CONFIG CHANGE: There are no more database settings in OpenSim.ini. Check the config-include configuration files for region store and estate store database settings
2010-09-12 14:20:26 -07:00
7e65590a55
Update Prebuild.exe with Prebuild r323 + an existing OpenSim specific nant hack to correctly clean up chosen OpenSim exes and dlls in bin/ on a "nant clean"
...
Source code is included for reference. This can go away again once Prebuild is updated with a more general mechanism for cleaning up files.
The Prebuild source code here can be built with nant, or regnerated for other tools using the prebuild at {root}/bin/Prebuild.exe
2010-09-11 01:13:08 +01:00
29708e47a5
Merge branch 'prebuild-update'
2010-09-10 22:38:56 +01:00
d301f3fd6a
Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.
2010-09-08 14:12:01 -07:00
0bebe94231
Rolling back the recent libomv update but keeping the ExpiringCache cleanups (as much as is possible). There was a report of non-finite avatar positions after the update
2010-09-07 15:45:33 -07:00
9be1c0ff44
* Cache null account responses in the SimianUserAccountServiceConnector to avoid repeated requests for missing avatar IDs
...
* Updated to OpenMetaverse r3442 to fix a timezone issue with ExpiringCache
2010-09-07 14:41:13 -07:00
910aa48df3
Corrected SimianGrid.ini and HyperSimianGrid.ini configs to specify services in the way the ROBUST loader expects them (hopefully!)
2010-09-07 11:13:37 -07:00
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
1e44ec84bd
Build system upgrade:
...
Upgrading Prebuild.exe to correctly construct build solutions
for crossplatform tools such as xbuild, monodevelop and nant.
NOTE: Module prebuild files will need modification to work,
as the prebuild must correctly define the reference path for
all assemblies shipped in the OpenSimulator ./bin directory.
These include assemblies such as XMLRPC.dll, OpenMetaverse.dll,
Nini.dll, etc. . The entries should follow the form:
<Reference name="Nini" path="../../../bin/"/>
See the distributed prebuild.xml for further examples.
Crossplatform tools: xbuild and monodevelop use the
vs2008 OpenSim.sln and the .csproj files in each namespace.
Changes to the Prebuild.exe are against svn 322 and are included
in a patch attached to the mantis. And the dnpb source are
available@ svn co https://dnpb.svn.sourceforge.net/svnroot/dnpb dnpb
The patches are pending application by the dnpb team. After which,
the un-modified upstream Prebuild.exe will work as expected.
2010-09-04 02:12:21 +01:00
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
b8da15c104
In RemoveAdminPlugin, use a .ini file template in XmlRpcCreateRegionMethod rather than an older XML one
...
This is a patch from http://opensimulator.org/mantis/view.php?id=4973 . Thanks randomhuman
2010-09-03 22:38:40 +01:00
4f79143f3f
* Removed Simian.IsSimianEnabled() call, changed the SimianGrid connectors to handle initialization as graceful as possible with the current broken way region module initialization is done
...
* Added config-include/HyperSimianGrid.ini option for connecting to SimianGrid with HyperGrid enabled (work in progress on the SimianGrid side)
2010-09-03 13:36:35 -07:00
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
3c71e5a3a2
Deleted Check4096 from Robust.ini.example
2010-08-26 18:23:16 -07:00
fe660cd2cc
Rename Newtonsoft.Json.dll to properly reflect its actual assembly name
2010-08-26 18:11:01 +01:00
252e159340
Merge branch 'master' into careminster-presence-refactor
2010-08-25 23:22:23 +01:00
a2113ecc71
Typo
2010-08-24 21:01:37 -07:00
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
8d8436e0ca
Correct a minor typo
2010-08-21 20:59:25 +01:00
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
c41ff51bd3
OpenSim.ini.example FreeSwitch section improvements, move of XML-RPC section away from end and correction of typo "fro" (fixes Mantis 4833)
2010-08-20 19:08:26 +01:00
a87840bd1c
Make some small corrections to ini.example file changes. These are not functional changes.
2010-08-20 18:25:44 +01:00
2c0ba8718a
Robust.ini.example and Robust.HG.ini.example default: corrected comment about realm for UserAccountService to state default is useraccount, and include default realm commented out in every case
2010-08-20 18:03:21 +01:00
ae554a48d0
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:36:23 +01:00
47838e5fb3
Add some maptile options, change maptile generation from OpenSimBase to Scene
...
to make it more configurable.
2010-08-20 08:46:46 +02:00
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
e47608fc62
One more go at GetExternalIpOf(user). Addresses mantis #4955 and #4943 .
...
(Files .xml and .txt also want to be committed)
2010-08-18 16:22:50 -07:00
8c12f22140
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-18 23:15:25 +01:00
11db33d520
Add textures no longer shipped with newer viewers to OpenSim's standard asset library
...
These are appropriately licensed and include plant, tree and miscellaneous textures (face target crosshairs, etc).
Many thanks to Nebadon for sourcing and packaging these.
2010-08-18 23:15:05 +01:00
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
e1f2c32284
* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecasts going in the other direction
2010-08-17 12:26:20 -07:00
53190e332d
Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts
2010-08-17 12:04:37 -07:00
df9521caf3
Add ini.example section for the MOTD module.
2010-08-11 15:30:42 -07:00
321e1148da
Merge branch 'master' into careminster-presence-refactor
2010-08-08 18:24:33 +01:00
a87dbe198c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-08 09:51:17 -07:00
1314c87f36
Enabled GridInfoServiceInConnector for standalones.
2010-08-08 09:50:41 -07:00
cd2c7b9ac9
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 01:57:02 +01:00
50ac61e17f
In my crusade against facelights, I am striking the killing blow. Add a
...
DisableFacelights option to OpenSim.ini to finally kill those immersion-
breaking, silly vanity lights that destroy nighttime RP. Girls, you look
just fine without them. Guys, you too. Thank you. Melanie has left the building.
2010-08-08 02:01:24 +02:00
97f8175090
Delete some files from bin that should not have been committed
2010-08-07 18:34:11 +02:00
047a4764f2
and another one...
2010-08-07 13:19:53 +00:00
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
0090534793
Added Check4096 config var under [GridService], at the request of many. Changed the iteration that Marck had on the Hyperlinker.
...
ATTENTION! CONFIGURATION CHANGE AFFECTING Robust.HG.ini.example and StandaloneCommon.ini.example.
2010-08-06 17:43:09 -07:00
6321d85ebf
These files want to be committed -- white space weirdness.
2010-08-06 11:00:25 -07:00
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
0871d20adb
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-08-04 21:08:14 +00:00
cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
d987e8ef18
Revert "re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but"
...
This reverts commit 9c7e35860e
2010-08-04 01:09:51 +01:00
164719119b
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:01:08 +01:00
9c7e35860e
re-Add the XML configuration loader dll. It's gone AWOL in a cleanup, but
...
still needed for web-loading region configs and for loading legacy XML
region files
2010-08-04 01:00:06 +01:00
e12993ed22
Merge branch 'master' into careminster-presence-refactor
2010-08-04 00:33:02 +01:00
239478f3a9
Bug fix (HG): mantis #4891 . This doesn't actually fix the underlying bug, but it clears up the circular dependency issue between Gatekeeper and UserAgents that had made me resort to in-process remote calls, which, in turn, were hitting bugs down there somewhere in mono.
...
NOTE: CONFIGURATION CHANGE IN ROBUST.HG.INI.EXAMPLE !!!###!!!
2010-08-03 16:02:52 -07:00
d5f497478a
Add config option securePermissionsLoading which will stop the region from loading if the specified permissions modules fail to load.
2010-08-01 10:21:56 -07:00
7a9e246ccd
Merge branch 'master' into careminster-presence-refactor
2010-07-29 16:20:59 +01:00
1996eb93b9
Update OpenMetaverse libraries to r3287 + r3294 (removal of OpenMetaverse.Http.dll dependency) + r3378 (treat MediaPermission as a bitfield)
...
As far as I can determine, r3287 + r3294 patch was the previous update to the OpenMetaverse libraries
This change just adds r3378 to overcome problems storing media textures with certain permission combinations in inventory
This is a limited change in order to isolate moap from any other possible libomv update issues
An update to the forthcoming libomv 0.8.3 is expected in due course to replace this
This commit also deletes OpenMetaverse.Utilities.* as it's unused (on the advice of jhurliman).
2010-07-27 21:52:50 +01:00
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
7b471bb21c
Adding sample configuration to previous patch
2010-07-22 03:04:34 +01:00
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
ef6565470f
XGitminster: Update config options; commitFrameInterval -> CommitInterval and a new option DisableNonEssentialCommits
2010-07-17 06:54:46 -07:00
b75fc97865
Fixes mantis #4872 . Port for GridInfo was wrong in Robust.HG.ini.example
2010-07-15 03:34:03 -07:00
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
e17591f4cf
Cleaned up a couple of things from OpenSim.ini.example: [Friends] section has been in other inis for a while, not needed here; and [Network] remoteDataPort is obsolete.
2010-07-14 08:52:22 -07:00
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
cd19e6fe32
Fixes mantis #4842
2010-07-05 07:38:15 -07:00
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
c117f2144c
Compiled Robust.32BitLaunch.exe to .Net 3.5
2010-07-03 10:40:33 -07:00
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
7868f1f650
Fixed Robust.32BitLaunch.exe
2010-06-27 13:06:39 -07:00
5b6485481b
Add extra Gitminster config options to ini.example
2010-06-26 11:02:09 -07:00
6c6c7b0927
Remove libs from main tree
2010-06-26 06:25:03 +02:00
d3d63fe553
remove conflicting pdb debug files
2010-06-26 06:21:38 +02:00
8daa149c36
Remove the prepending slash from the default git repo name
2010-06-25 13:03:00 -07:00
3ef70b55e9
Whoops, enabled = true not enabled = 1
2010-06-25 12:58:13 -07:00
e0d533dc4e
Add [Git] section to OpenSim.ini.example for Gitminster
2010-06-25 12:55:02 -07:00
94ece2789d
Add some libraries for XGitminster
2010-06-25 12:21:24 -07:00
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
8c56f04f82
add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch to OpenSim.ini.exmaple
...
Also tidies up and comments some existing entries
2010-06-23 01:21:49 +01:00
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
514732595b
minor: try and make the explanations for the AllowScriptCrossing and TrustBinaries settings in OpenSim.ini.example clearer
2010-06-18 23:38:40 +01:00
de84da9e7b
eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon
...
this is only used by SimianGrid and is now in SimianGrid.ini
2010-06-18 23:20:32 +01:00
ed01e9162d
Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exe
...
This addresses http://opensimulator.org/mantis/view.php?id=4772
Thanks to aiaustin for pointing this out
2010-06-18 23:11:31 +01:00
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
07b8eddb64
Typo corrected in Robust.HG.ini.example
2010-06-14 19:11:49 -07:00
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00
eff641ab83
Added Old Guids=true to all MySql connection strings.
2010-06-12 17:08:05 -07:00
9648f08dc9
Add the AllowLightShareFunctions example
2010-06-11 17:53:49 +01:00
8a084cb7e1
Remove a company name referecne from the example
2010-06-11 17:52:29 +01:00
20ea823c19
Merge branch 'master' into careminster-presence-refactor
2010-06-08 22:07:01 +01:00
c8b301a644
Improve instructions for [Groups] setup in OpenSim.ini.example
2010-06-08 21:12:01 +01:00
890f3cc54c
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 15:46:54 +02:00
f1a1d7a521
Changes osFunction permissions again. Allow_ with a list of UUIDs now again
...
refers to prim OWNERS. A new option set, Creators_, is added to allow
selection by script creator. For existing installs, this means no functional
change. The warning from my prior commit doesn't apply anymore.
2010-05-30 14:42:58 +01:00
9e3b5a5587
Remove orphaned .dll.config files from tests
2010-05-26 19:29:56 +02:00
ccbcf421e7
Merge branch 'master' into careminster-presence-refactor
2010-05-21 15:27:17 +01:00
a2e24377b4
Replace CSJ2K with fixed version (Mantis #3318 )
2010-05-21 15:26:04 +01:00
a92780fe5f
Merge branch 'master' into careminster-presence-refactor
2010-05-21 03:51:58 +01:00
b6674c9b76
Merge branch 'careminster' into careminster-presence-refactor
2010-05-21 03:03:35 +01:00
ddd072b3fb
Merge branch '0.6.9-post-fixes' into careminster
2010-05-21 02:44:20 +01:00
e260610c00
Merge branch 'Migrations'
...
This merges AlexRa's work on migration streamlining. This merge is experimental.
If it causes issues, feel free to back out.
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-18 19:03:16 +01:00
55f124745f
Allow remote admin to be used on a different port from the main region port
2010-05-18 19:25:40 +02:00
3e1f2ddb8e
Allow remote admin to be used on a different port from the main region port
2010-05-18 17:01:44 +01:00
49f4becdae
* Fixed configs in StandaloneHypergrid.ini, it still had the SQLite connection strings.
...
* Added a comment in LLLoginService.cs, for future reference
2010-05-16 08:10:57 -07:00
b94cace547
Merge branch 'master' into careminster-presence-refactor
2010-05-16 15:01:56 +01:00
a49716dc2f
Embedded MySql.Data.dll updated to 6.2.3.0.
...
This is necessary to correct a known problem with the
DELIMITER command in previous versions of the client library.
2010-05-16 16:24:50 +03:00
8368494554
Removed the unreferenced MaxPrimsPerFrame from OpenSim.ini.example
2010-05-12 13:52:21 -07:00
6a3e1734e6
Merge branch 'master' into careminster-presence-refactor
2010-05-09 18:03:57 +01:00
60357d3778
Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler.
2010-05-09 17:56:52 +01:00
4e0d62547d
Merge branch 'master' into careminster-presence-refactor
2010-05-09 17:04:23 +01:00
c1fe07b022
* Added missing loggout notification to home grid upon agents logging out in foreign grids.
...
* Added missing config in StandaloneHypergrid.ini
2010-05-08 12:21:17 -07:00
14fcc2510e
Merge branch 'master' into careminster-presence-refactor
2010-05-08 13:31:36 +01:00
a58859a0d4
GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
...
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
11971fb302
Merge branch 'master' into careminster-presence-refactor
2010-05-06 16:09:36 +01:00
53594e599e
* Fixes Library bugs in grid mode. Partly a missing check and partly a missing configuration.
...
* Made previous Robust config changes consistent in Robust.HG.ini.example
2010-05-05 21:12:13 -07:00
65775b87e5
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 23:06:36 +02:00
fe8399d1bf
Add a XMLRPC method to remotely set the login level for the LLLoginService.
...
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
91cfce3758
back port groups changes
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-05-05 16:11:00 +01:00
8a69070b51
back port groups changes
2010-05-05 16:09:53 +01:00
9f8acbfe3e
Merge branch 'master' into careminster-presence-refactor
2010-05-03 01:40:24 +01:00
bd49985afa
Switched everything to XInventory by default. The old Inventory is still there for now, in case bugs pop up with XInventory.
2010-05-02 10:31:35 -07:00
9bc5098dd8
Merge branch 'master' into careminster-presence-refactor
2010-04-30 20:15:19 +01:00
89e79c1133
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-04-30 17:54:00 +01:00
cc67de5b86
rename SQLiteNG to SQLite and SQLite to SQLiteLegacy
...
this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG
MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone)
See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details
This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
2010-04-30 17:45:00 +01:00
60dbc3c6ce
Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux.
...
I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library)
Unfortunately, I need to shaft somebody (as it were)
2010-04-30 17:01:50 +01:00
08ebcdb0b8
Merge branch 'master' into careminster-presence-refactor
2010-04-29 23:33:26 +01:00
6d05ea2a75
update Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which is the one known to work in Windows
...
Thanks for the initial library inclusion, Diva. I had it all queued up on my windows test machine but forgot to add it!
2010-04-27 20:44:04 +01:00
bbffe16f13
Merge branch 'master' into careminster-presence-refactor
2010-04-27 00:27:05 +01:00
2686573b1c
Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
2010-04-26 15:03:47 -07:00
15d42d2111
Add instructions for using SQLiteNG to OpenSim.ini and config-include/StandaloneCommon.ini
...
Unfortunately, database settings need to be changed in two places.
2010-04-23 22:06:02 +01:00
847cc4fceb
remove [DatabaseService] section from OpenSim.ini since this is always present in included configuration files
2010-04-23 21:31:08 +01:00
10e18f465e
minor: eliminate configuration section handling deprecation of OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
2010-04-23 21:29:09 +01:00
c9da66728a
Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.
2010-04-22 07:25:32 -07:00
98cb4f74b2
Merge branch 'master' into careminster-presence-refactor
2010-04-19 07:00:40 +01:00
f8d49e0a30
Merge branch '0.6.9-post-fixes' into careminster
2010-04-19 06:32:29 +01:00
b7457a0a5d
Update OpenMetaverse libraries to those used in master as of commit 9a781e7
...
This removes Mono.Security.dll which might help with Mono 2.6.3 compatability issues (notwithstanding the sqlite problem)
2010-04-18 19:16:41 +01:00
a7aab6af0c
This version of the launcher exe works.
2010-04-14 19:39:27 -07:00
bdc03dbff9
* Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
...
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
fe034dc3e4
Merge branch 'master' into careminster-presence-refactor
2010-04-05 18:12:29 +01:00
ee198eaa11
Updates to config files for groups
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-04-04 21:56:57 +01:00
d315fce2ff
Adding the configuration example
2010-03-31 04:22:51 +01:00
7d917e7c5c
Rename Meta7Windlight to LightShare
2010-03-30 23:29:03 +01:00
5693870fe2
Merge branch 'master' into careminster-presence-refactor
2010-03-30 21:34:27 +01:00
f55dd3704d
Hippos with bin/Newtonsoft.Json.XML
2010-03-26 13:14:13 -07:00
6ad85dc259
put out full exception stack if something reaches top of base http server OnRequest() on both mono and .net
...
replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
2010-03-25 20:33:46 +00:00
9a781e793a
* Updated libomv libraries to fix JSON (LLSD) decoding errors on null values and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll
...
* Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
2010-03-20 19:21:58 -07:00
4c2a51b1b5
Merge branch 'master' into careminster-presence-refactor
2010-03-18 20:09:04 +00:00
b51f40da8f
Removed the unused use_async_when_possible config variable
2010-03-16 12:03:04 -07:00
28e4302eb6
Fixed a bad module name in SimianGrid.ini
2010-03-15 22:07:28 -07:00
d3f33acc1a
Merge branch 'master' into careminster-presence-refactor
2010-03-15 17:23:35 +00:00
5beb08be31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-12 14:40:21 -08:00
3036aba875
* Added a better check to the SimianGrid connectors to test if they are enabled or not. This method should work equally well with standalone or robust mode
...
* Applying #4602 from Misterblu to add collision detection to BulletDotNET
2010-03-12 14:28:31 -08:00
19b4770fe7
start laoding griduser local connector, though it isn't invoked by anything yet
2010-03-12 22:18:48 +00:00
aad17e7513
Simplify database setup and remove migration problems by moving all sqlite config-include settings to a separate file for standalone
...
Update information in StandaloneCommon.ini.example to reflect this
Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.).
Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files
Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
2010-03-12 20:29:17 +00:00
7d738156fa
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2010-03-12 20:06:40 +00:00
8b1e33eb2d
Fixed SimianGrid.ini to use GridCommon.ini(.example)
2010-03-12 10:31:43 -08:00
e844524b41
Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6
...
Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
2010-03-11 21:04:56 +00:00
2040649871
Adding the SimianGrid connectors
2010-03-11 11:19:02 -08:00
40873504dc
Merge branch 'master' into careminster-presence-refactor
2010-03-09 22:46:17 +00:00
4423630f1e
remove milliseconds from console log again
2010-03-09 18:56:32 +00:00
5caae0293a
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
Backport from head.
2010-03-09 18:53:04 +00:00
2362da2ad0
Add config option for switching between CSJ2K and BuggyJPEG.
2010-03-08 20:29:26 +00:00
d71ed7081b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-03-07 16:05:12 -08:00
3ecccbb77d
* Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
2010-03-07 16:03:15 -08:00
38b8c52762
Removed obsolete configs.
2010-03-07 10:01:23 -08:00
8180c72cbc
Merge branch 'master' into careminster-presence-refactor
2010-03-06 12:37:24 +00:00
1f7a0cf892
Merge branch '0.6.9-post-fixes' into careminster
2010-03-06 12:24:09 +00:00
b88259db7d
revert accidental Standalone.ini change
2010-03-05 23:19:22 +00:00
e906dd3d28
add initial UserGrid service classes as per diva's direction
...
this will initially store home location data instead of the presence service
compiles but not enough to actually test yet
2010-03-05 22:29:51 +00:00
f5a088c9cc
Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict.
2010-03-04 08:33:01 -08:00
107a0a4905
Merge branch 'master' into careminster-presence-refactor
2010-03-04 11:02:01 +00:00
e97ba57788
reset the accidental local configuration changes
2010-03-03 22:20:06 +00:00
edb176447b
Fix bug where approximately half the time, attachments would rez only their root prim until right clicked (or otherwise updated).
...
The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client.
Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates.
The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
2010-03-03 22:14:06 +00:00
13f0e4a718
* Better debug message on login problems.
...
* Moved GridInfoService config to OpenSim.Server.ini
2010-03-02 20:17:25 -08:00
7ec1a3fcad
Merge branch 'master' into careminster-presence-refactor
2010-03-03 03:18:19 +00:00
028a87fe37
Merge branch 'master' into careminster-presence-refactor
...
This brings careminster on the level of master. To be tested
2010-03-03 02:07:03 +00:00
38ea1dd5c8
Merge branch 'master' into presence-refactor
2010-03-01 01:01:32 +00:00
774958bbbf
Added FriendsData to both Null storage and SQLite. Untested.
2010-02-28 16:09:06 -08:00
cc05bdf6ab
* Friends out connector completed. Grid login retrieves friends correctly.
...
* Added friends configs to grid .inis
2010-02-26 08:46:30 -08:00
c745df007d
Added server-side Friends in connector. Untested.
2010-02-25 17:42:51 -08:00
679ad95750
List of friends now retrieved upon login. Configured and tested in standalone only.
2010-02-25 16:11:04 -08:00
0b73ee3cd8
Add part of the needed config examples
2010-02-25 03:14:23 +00:00
c7b1e76eb5
Add the stream handler/listener and requisite methods to the friends module
...
for the friends interregion comms.
2010-02-25 01:46:34 +00:00
0d85f4f861
Deleted duplicate [GridService] section.
2010-02-22 09:56:03 -08:00
e6c869ddfc
Minor formatting cleanup.
2010-02-22 13:18:11 +09:00
552e9e8c78
* Added SQlite connector for AvatarData. Tested -- works.
...
* Small bug fix in debug message
* Set default standalone configs to use SQLite across the board
2010-02-21 09:09:35 -08:00
0ab6aac052
Added UserAccountData and auth to the SQLite connector. Compiles, runs, but access to these tables doesn't work.
2010-02-20 17:52:38 -08:00
dc19785672
Added UserAccount, Avatar and Authentication to Data.Null, so that OpenSim can run out-of-the-box. #WaitingForSQLite
2010-02-14 16:57:02 -08:00
9f5b39300a
Add InventoryService to default standalone config
2010-02-08 20:26:47 +00:00
baaf660511
Merge branch 'master' into presence-refactor
...
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
b18e95b3a2
Added missing configs to Standalone.ini
2010-02-08 07:49:14 -08:00
df3ab04e0c
Removed useless config.
2010-02-02 16:54:55 -08:00
35a245b67a
Assorted bug fixes related to hyperlinking
2010-01-31 22:35:23 -08:00
0b89afd3e5
* Simplified the configuration by having [DatabaseService] in it
...
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
a6b50c2436
In HG, add asset service handlers to 8002, to make it even easier.
2010-01-31 14:07:26 -08:00
af758ea164
* More config cleanup
...
* Added different ports (8002 and 8003) to the many services in OpenSim.Server.ini.example
* Added a separate OpenSim.Server.HG.ini.example to make it easier to run
2010-01-31 14:01:47 -08:00
823b9607e2
Can't comment [Network] even if it's not used.
2010-01-31 13:19:03 -08:00
67b0fcf806
* Added OpenSim.Server.HG.ini as an add-on to OpenSim.Server.ini
...
* Cleaned up standalone configs
2010-01-31 13:07:13 -08:00
041594ed07
Cleaned up configuration. 'gridmode' and 'hypergrid' are gone, as well as lots of other obsolete configs.
2010-01-31 13:01:23 -08:00
40d8e91008
* Added a few files that were missing in the repo.
...
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
a2096f58ce
Updated gridhypergrid config.
2010-01-30 17:41:01 -08:00
42f978a478
* HGScene is no more.
...
* Moved a few key inventory access methods from Scene.Inventory to an IInventoryAccessModule module
2010-01-30 09:23:07 -08:00
5001f61c08
* HGGridConnector is no longer necessary.
...
* Handle logout properly. This needed an addition to IClientAPI, because of how the logout packet is currently being handled -- the agent is being removed from the scene before the different event handlers are executed, which is broken.
2010-01-29 18:59:41 -08:00
0c81966c0a
Works for grid login.
2010-01-29 09:12:22 -08:00
c9e64d578d
Fixed broken dll name.
2010-01-28 19:36:42 -08:00
c99f40fc53
Config for grid login. Untested.
2010-01-28 19:32:23 -08:00
00f7d622cb
HG 1.5 is in place. Tested in standalone only.
2010-01-28 19:19:42 -08:00
5b9ca6e35f
Merge branch 'master' into careminster
2010-01-28 14:38:46 +00:00
ee12b00cfa
Fixes inconsistencies in the permissions module. Adds a region_manager_is_god
...
configurable. Previously, estate managers could enter god mode, but would
not have any powers. Now estate managers can enter god mode only if this
option is true, and then will have real god powers.
2010-01-28 14:34:31 +00:00
7c00469cd2
Added ExternalName config on Gatekeeper.
2010-01-27 08:00:29 -08:00
b1b9ac2e74
Added image for hyperlink map tiles.
2010-01-25 09:08:57 -08:00
8ddf787cfd
Hypergrid map search back on, this time with a config var in the grid service.
2010-01-24 16:00:28 -08:00
48b03c2c61
Integrated the hyperlinking with the GridService.
2010-01-24 14:30:48 -08:00
946e06eb58
Merge branch 'master' into careminster
2010-01-21 23:47:40 +00:00
6c1dd2dfa7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-01-20 00:16:54 +00:00
c211a120a5
Console output no longer requires loglevel to be set to info; you can run the simulator with log level WARN or ERROR and see the output of console commands
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-01-20 00:16:08 +00:00
c89a9912cc
Add OpenSim.Server.ini.example documentation for the new AllowDuplicateNames grid service setting
2010-01-19 19:58:50 +00:00
9fbcceb1db
* Towards enabling hyperlinks at grid-level.
...
* Updated grid configs
2010-01-18 20:35:59 -08:00
24056dc98b
Adds example to OpenSim.ini.example for Admin Default Parcel settings
2010-01-19 01:46:50 +00:00
3d53694415
Go Home works. With security!!
2010-01-18 16:34:23 -08:00
b5fcb5e872
HG teleports through gatekeeper are working.
2010-01-17 20:10:42 -08:00
b2e6ec9e12
Agent gets there through the Gatekeeper, but still a few quirks to fix.
2010-01-17 18:04:55 -08:00
f276ba57bf
HG agent transfers are starting to work. Gatekeeper handlers are missing.
2010-01-17 11:33:47 -08:00
a7309d90da
* Added ServiceURLs to AgentCircuitData.
...
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
04e29c1bac
Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet.
2010-01-16 21:42:44 -08:00
bd6d1a2444
Moved prim crossing to EntityTransferModule. Not complete yet.
2010-01-16 07:46:07 -08:00
8c39392eaa
Merge branch 'master' into careminster
2010-01-16 00:15:26 +00:00
10f8c2ea9b
Merge branch 'master' into presence-refactor
...
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
f1c30784ac
* General cleanup of Teleports, Crossings and Child agents. They are now in the new AgentTransferModule, in line with what MW started implementing back in May -- ITeleportModule. This has been renamed IAgentTransferModule, to be more generic.
...
* HGSceneCommunicationService has been deleted
* SceneCommunicationService will likely be deleted soon too
2010-01-15 15:11:58 -08:00
046a195c2e
Add "create user" instructions to README.txt
...
Add documentation to [Standalone] accounts_authenticate setting
2010-01-15 18:16:21 +00:00
f5fb14ff52
* Added the missing AvatarServices module.
2010-01-13 19:57:41 -08:00
daa9866a9a
Omit AuthorizationService from the default configurations, because the service doesn't exist in the distribution.
2010-01-13 19:25:33 -08:00
283ff593b1
Make use of Fallback regions when the desired start region is having problems.
2010-01-13 18:30:33 -08:00
f0152790cf
Merge branch 'master' into careminster
2010-01-14 01:20:07 +00:00
14ab9b04c4
LL Login now uses default regions if the desired start location is not found.
2010-01-13 15:28:46 -08:00
d939668d6a
Bug fix in create user: create inventory was missing.
2010-01-13 10:15:14 -08:00
fa272e7521
Updated configs.
2010-01-13 09:44:20 -08:00
4f2d2c4efa
minor: add a line of documentation to the new ForwardOfflineGroupMessages [Messaging] switch
2010-01-12 20:52:44 +00:00
66920a9047
Fixed more appearance woes that showed up using remote connectors. Appearance is now being passed with AgentCircuitData, as it should be.
2010-01-12 09:22:58 -08:00
77e43f4801
Fixed a couple of bugs with Appearance. Appearance is all good now.
2010-01-11 17:30:05 -08:00
7467a471ca
Add the option to reject duplicate region names
2010-01-11 22:52:05 +00:00
fcaef85029
Add explanation about AllowModFunctions to OpenSim.ini.example
...
This switch allows scripts to pass messages to modules via the modSendCommand() function
Modules can then send messages back to scripts via the link_message LSL event through
invoking DispatchReply() on OpenSim.Region.Framework.Interfaces.IScriptModuleComms
2010-01-11 17:13:03 +00:00
20e748205e
Merge branch 'master' into careminster
2010-01-11 03:50:24 +00:00
2b478a61d0
Add the console port setting to ROBUST, too
2010-01-11 03:49:05 +00:00
e966e51b89
Add a console_port setting to let the rest console use a different port
...
from the region server
2010-01-11 03:29:24 +00:00
49618dc102
Moved GridInfo service from where it was to Handlers/Grid
2010-01-10 19:19:34 -08:00
eb6d49e02c
Fixed small inconsistency in config var name.
2010-01-10 17:19:40 -08:00
b0bbe861cd
Moved OpenId authentication from user server to Server.Handlers.Authentication.
2010-01-10 17:15:02 -08:00
c0642bf7e0
Merge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/opensim into presence-refactor
2010-01-10 15:35:15 -08:00
4dd523b45d
* Changed IPresenceService Logout, so that it takes a position and a lookat
...
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00
3c90d834ea
Remove all references to master avatar, replacing with estate owner where
...
appropriate. This changes the behavior of the REST plugins and RemoteAdmin's
region creation process.
2010-01-10 22:41:42 +00:00
6998668bbc
* Last reference to CommsManager.UserProfileCacheService removed
...
* Grided-sims added the Library module
2010-01-10 14:12:03 -08:00
1676e70dfe
Merge branch 'master' into careminster
2010-01-10 04:16:06 +00:00
b0a7bcb2c8
Add "StartDisabled" to [Startup] to make all regions start up with
...
logins disabled until enabled from the console. Add the AccessModule (WIP)
2010-01-10 03:17:40 +00:00
96ecdcf9c5
* Added SetPassword to IAuthenticationService.
...
* Added create user command to UserAccountService. Works.
* Deleted create user command from OpenSim.
2010-01-09 18:04:50 -08:00
d22bdb5095
Merge branch 'master' into careminster
2010-01-09 12:02:48 +00:00
b297913e2b
Add some notes to OpenSim.ini.example suggesting to use MySQL with Mono installations
2010-01-08 22:58:01 -08:00
1e899704c1
Adds config option "ForwardOfflineGroupMessages" to allow disabling of group messages forwarded while offline. Addresses Mantis #4457
2010-01-07 11:28:38 -08:00
54e6c26def
Merge branch 'master' into careminster
2010-01-04 22:29:43 +00:00
39293758f1
Merge branch 'master' into presence-refactor
2010-01-04 22:28:27 +00:00
ab0dfbc163
Update SQlite to newest
2010-01-04 22:24:01 +00:00
1ac36bb5d9
Forgot to add these to the grid configs, so that logins work.
2010-01-04 07:45:20 -08:00
add8d5df4c
Config for non-HG grided sims.
2010-01-03 20:06:06 -08:00
99efa99585
Successfully logged into a grid.
2010-01-03 11:44:57 -08:00
c268e342d1
* Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
...
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
2010-01-03 09:35:12 -08:00
8a9677a531
The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible.
2010-01-01 21:12:46 -08:00
ec53301e63
Forgotten modules in prior commit.
2010-01-01 18:59:54 -08:00
4240f2dec6
New LL login service is working! -- tested in standalone only. Things still missing from response, namely Library and Friends. Appearance service is also missing.
2010-01-01 16:54:24 -08:00
1387919c20
Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year...
...
* HAPPY NEW YEAR!
2009-12-31 20:51:35 -08:00
b29ae72460
First pass at the new login service. Still incomplete, but doesn't disrupt the existing code.
2009-12-30 21:00:16 -08:00
be2f033626
More renames to make everything consistent. This is the UserAccountService.
2009-12-29 17:21:16 -08:00
88d2df597e
* Fixed names.
...
* Added configs for Standalone
* Changed UserSericeBase to use useraccounts instead of user
2009-12-29 16:34:02 -08:00
f43a648052
* Added the new modules to Resources, making them active.
...
* Added their configs to standalone for testing. This crashes, because the DB is still not ready.
2009-12-28 09:22:35 -08:00
e3f60ce06f
Merge branch 'master' into careminster
2009-12-27 15:48:43 +00:00
763fa90be5
* Adding Google.ProtocolBuffers.dll dependency (BSD licensed)
...
* For some experimental work with a Sirikata clientstack.
2009-12-27 14:34:41 +11:00
0054afd39b
Merge branch 'master' into careminster
2009-12-24 16:45:27 +00:00
1fa938aab0
Library Module: allows adding folders/items to the Library from IAR files placed under bin/Library. This works only for standalones.
2009-12-23 17:31:30 -08:00
3d3e0ea4f3
Merge branch 'master' into careminster
2009-12-20 16:45:28 +00:00
ba7552665c
remove OpenSim.GridServer.ini.example that has been folded into ROBUST
...
please revert if I'm wrong
2009-12-15 18:21:10 +00:00
668604c203
Delete obsolete AssetInventoryServer.ini.example which was for the removed cable beach component
2009-12-15 16:50:23 +00:00
824d7190c2
Merge branch 'master' into careminster
2009-12-14 00:40:56 +00:00
c426549f53
Add an option to exit an instance rather than restarting a region within it
2009-12-14 00:31:15 +00:00
a6a6bf007a
Move osFunctions into a new Careminster script interface
2009-12-09 23:28:00 +01:00
d092977f4a
Windlight configuration option in ini, and migration
2009-12-09 01:53:41 +01:00
43a6fa1d01
Merge branch 'master' into careminster
2009-12-05 19:53:54 +00:00
07786786fc
* Clarifies that the PrimMaxPhys in OpenSim.ini.example does nothing. Tells user to set it in Regions.ini. Melanie might want to take a look at this and see if it should be removed altogether.
2009-12-03 20:30:40 -05:00
781db43a76
* Fixes the 10x10x10 hard physics limitation. (wierdly, you have to set this for each region in your Regions.ini[PhysicalPrimMax = 10(default)])
...
* Adds a configurable maximum object mass before the mass is clamped. Default is 10000.01. Configurable by changing maximum_mass_object in the [ODEPhysicsSettings] section.
* Clamping the mass is important for limiting the amount of CPU an object can consume in physics calculations. Too high, and the object overcomes restitution forces by gravity alone. This generates more collisions potentially leading to 'deep think'.
2009-12-03 20:21:10 -05:00
ded16d3529
Merge branch 'master' into careminster
2009-12-02 00:36:53 +00:00
85f7e4a6ab
Remove leftover IronPython DLLs
...
This completes http://opensimulator.org/mantis/view.php?id=4395
2009-12-01 14:03:06 +00:00
17136724e2
minor: add disabled config and explanation for WebStats
2009-11-30 18:37:51 +00:00
87c88ff702
enable messaging_server_url by default in OpenSim.ini.example
...
having this enabled results just in warning messages if no message service is actually available
haivng this disabled results in an unexpected failure if no message service is available
2009-11-30 18:06:10 +00:00
79395bc7db
Merge branch 'master' into careminster
2009-11-25 17:04:05 +00:00
f9807884a4
Add MIT/X11 licensed NDesk.Options ( http://www.ndesk.org/Options ) DLL to aid command line parsing
2009-11-25 15:28:43 +00:00
d5aceb6d95
Append a prefix to the god avatar names appearing in chat whilst in god mode (disabled by default, config entry admin_prefix)
2009-11-24 23:33:12 +01:00
a88a463b50
Following various discussions on irc and in the OpenSim dev OSGrid meeting last week, change av_capsule_tilted to false by default
...
This appears to now give better ODE physics response (less sinking into the ground, etc.)
Please change it back if this is actually a bad idea for some reason
2009-11-09 19:26:42 +00:00
7965b6eb61
* Moving parcel media and avatar update packets from the unthrottled category to task
...
* Fixing a bug where the max burst rate for the state category was being set as unlimited, causing connections to child agents to saturate bandwidth
* Upped the example default drip rates to 1000 bytes/sec, the minimum granularity for the token buckets
2009-10-30 00:43:46 -07:00
a05c67bebb
* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll
...
* Prints a warning for any future packet splitting failures
2009-10-30 00:08:41 -07:00
dd13fa361b
* Misc. formatting cleanup for the previous patch
...
* Added the new AppDomainLoading variable to the [XEngine] section in the example config
2009-10-29 05:56:37 -07:00
b81c829576
* Standalone logins will now go through the sequence of "requested region, default region, any region" before giving up
...
* Hip offset should have been added not subtracted (it's a negative offset). This puts avatar feet closer to the ground
* Improved duplicate checking for terse updates. This should reduce bandwidth and walking through walls
2009-10-28 14:13:17 -07:00
a65c8cdc38
* Reduce the velocity tolerance on sending terse updates to avoid slowly drifting prims/avatars
...
* Added contacts_per_collision to the ODE config section. This allows you to reduce the maximum number of contact points ODE will generate per collision and reduce the size of the array that stores contact structures
2009-10-28 12:45:40 -07:00
603e3650d3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2009-10-28 00:30:46 -07:00
588c543299
Updating the OpenJPEG libraries to the versions from libomv 0.8.0
2009-10-28 00:29:40 -07:00
79bf906e7d
Changed True to true in OpenSim.ini.example.
2009-10-27 20:33:14 -07:00
2525810e2a
Removed the DotNetEngine scripting engine. You will need to create a fresh checkout or clean out all *DotNet*.dll assemblies from the bin/ directory to run OpenSim moving forward
2009-10-27 13:31:04 -07:00
3a1ee79ee4
Finally hunted down the Parallel deadlock. Packets were being handled asynchronously (filling up the threadpool with handlers), which would turn around and try to do parallel operations on the starved threadpool. The solution for now is to disable Parallel.cs operations until we can gracefully handle parallel operations with a potentially starved threadpool
2009-10-27 02:36:57 -07:00
b498693cff
* Tweak to region module loading to check for a matching constructor first instead of throwing and catching exceptions
...
* Commenting out the MySQL startup sequence that cleans out dropped attachments under the advice that it is no longer relevant. If anything, it could be brought back as a database cleanup console command
* Updated to the latest libomv 0.8.0-pre. UUID.TryParse() will no longer throw and catch exceptions for most failed UUID parses
2009-10-27 01:46:14 -07:00
4847e62e9f
* Switched all operations on the list of clients that could be either sync or async to use Scene.ForEachClient() instead of referencing ClientManager directly
...
* Added a new [Startup] config option called use_async_when_possible to signal how to run operations that could be either sync or async
* Changed Scene.ForEachClient to respect use_async_when_possible
* Fixing a potential deadlock in Parallel.ForEach by locking on a temporary object instead of the enumerator (which may be shared across multiple invocations on ForEach). Thank you diva
2009-10-26 16:33:04 -07:00
3639f68411
Added a missing reference to System.Core for OpenSim.Region.Framework
2009-10-25 01:20:54 -07:00
a41cd1d069
* Unregister Mono.Addins event handlers in PluginLoader.Dispose() and always handle PluginLoader with the using pattern. This freed up 121,634,796 bytes on my system
...
* Avoid allocating an Action<IClientAPI> object every round of the OutgoingPacketHandler
* Removed unnecessary semi-colon endings from OpenSim.ini.example [InterestManagement] section
2009-10-23 13:14:29 -07:00
4c45b5fd3c
Cleaning up OpenSim.ini.example for LLUDP. The [LLClient] section has been removed and several new parameters have been added to [ClientStack.LindenUDP]
2009-10-23 10:35:47 -07:00
62f1a5e36d
Implemented a "FrontBack" prioritizer, using distance plus the plane equation to give double weight to prims/avatars in front of you
2009-10-23 02:38:59 -07:00
96d53f11e5
Added VS2010 support to Prebuild and created runprebuild2010.bat
2009-10-22 17:03:13 -07:00
4121a02936
OpenSim.ini.example had the wrong names for default values in the [InterestManagement] section. Fixed
2009-10-22 10:15:28 -07:00
2f394b7e7e
* Allow SmartThreadPool to be initialized without setting max stack size (like the original implementation)
...
* Only initialize Util's SmartThreadPool if it is actually being used
* No longer initializing Util's SmartThreadPool with a custom max stack size. From MSDN: "Avoid using this constructor overload. The default stack size used by the Thread(ThreadStart) constructor overload is the recommended stack size for threads."
2009-10-22 01:30:12 -07:00
b35fbe1f98
Merge branch 'melanie_test' into prioritization
...
This makes SmartThreadPool configurable and also makes it the default, since
the regular thread pool simply stinks.
2009-10-22 07:02:21 +01:00
32ccd5bb40
* Changed the misc. methods calling ThreadPool.UnsafeQueueUserWorkItem() to Util.FireAndForget()
...
* Changed Util.FireAndForget() to use any of five different methods set with async_call_method in the [Startup] section of OpenSim.ini. Look at the example config for possible values
2009-10-21 23:03:18 -07:00
8ce4fd7234
Reduce the default pool threads to 15 (from 30) and the minimum from 5 to 2
2009-10-22 04:02:26 +01:00
8a336c6860
Add MaxPoolThreads in startup to limit the size of the thread pool used
...
for FireAndForget. This lets us limit concurrency to make OpenSim play nice
2009-10-22 02:28:53 +01:00
2b39ff0a39
Merged master into prioritization
2009-10-21 16:24:17 -07:00
2a886fd76c
Really make module port selection work. Implement port setting in
...
LLProxyLoginModule.
2009-10-21 02:19:45 +01:00
fdce1be3db
* Removed OpenSim.Data.NHibernate
...
* Replaced calls to ThreadPool.QueueUserWorkItem() with ThreadPool.UnsafeQueueUserWorkItem() since OpenSim does not use Code Access Security sandboxing
2009-10-19 16:52:27 -07:00
a3f93cffb4
* Committing Nini.dll with the patch from #3773 applied
...
* Fixing a log message typo
2009-10-17 22:06:36 -07:00
a9c88276f0
Merge branch 'master' into prioritization
2009-10-17 19:20:36 +01:00
4302329bfa
Change the example to match the facts
2009-10-17 19:19:49 +01:00
077f473167
Merge branch 'master' into prioritization
2009-10-17 13:41:32 +01:00
72b96bcd84
Add ProductName to RegionInfo (for search)
2009-10-17 13:36:45 +01:00
5a4fda9dc3
Updating OpenSim.ini.example with the section required to enable a useful prioritization scheme
2009-10-16 11:09:18 -07:00
9ddf598e54
minor: Change commented out authentication service realm setting to "users" to match defaults in code
2009-10-15 18:54:05 +01:00
fe4109a5b0
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 16:48:42 -07:00
06990b074c
Allow the LLUDP server to run in either synchronous or asynchronous mode with a config setting, defaulting to synchronous mode
2009-10-14 16:48:27 -07:00
82012ec4e3
* Clean up the SetThrottle() code and add a maxBurstRate parameter to allow more tweaking in the future
2009-10-14 16:21:48 -07:00
6bdd6ae0a0
Merge branch 'master' into htb-throttle
2009-10-14 23:31:38 +01:00
4b5a2f8c02
Merge branch 'htb-throttle' of ssh://opensimulator.org/var/git/opensim into htb-throttle
2009-10-14 11:44:17 -07:00
0d2e6463d7
* Minimized the number of times textures are pulled off the priority queue
...
* OnQueueEmpty is still called async, but will not be called for a given category if the previous callback for that category is still running. This is the most balanced behavior I could find, and seems to work well
* Added support for the old [ClientStack.LindenUDP] settings (including setting the receive buffer size) and added the new token bucket and global throttle settings
* Added the AssetLoaderEnabled config variable to optionally disable loading assets from XML every startup. This gives a dramatic improvement in startup times for those who don't need the functionality every startup
2009-10-14 11:43:31 -07:00
3795cface2
Enable LSL dialogs to display group names properly
2009-10-14 17:39:38 +01:00
d83ace0d3b
Merge branch 'master' into htb-throttle
2009-10-14 05:10:43 +01:00
bf68dad643
0004246: [Patch] FlotsamAssetCache deep scan & cache
...
Thank you, mcortez.
2009-10-12 23:21:32 +01:00
170d2c4660
Merge branch 'master' into htb-throttle
2009-10-12 15:25:42 +01:00
36dcfd2b80
* Changed logic of enabling LLProxyLoginModule to follow the new style -- true/false on the name, rather than gridmode=true.
...
* Better error messages on Add/Remove clients.
2009-10-11 10:23:16 -07:00
3a04d706c9
Fear the lockless LLUDP implementation!
2009-10-08 17:34:51 -07:00
46110b0195
change default ports for inventory and grid connectors in example .ini files to 8003 to match the ROBUST default
...
altered wiki page to reflect this
2009-10-05 20:18:35 +01:00
e1112ff879
MOre streams closed. Corrected word in GridCommon.ini.example
2009-10-03 08:46:06 -07:00
36c8d55827
Merge branch 'diva-textures-osgrid'
2009-10-03 00:03:09 +01:00
332d3eb1bb
* Removed code that is no longer used with Melanie's queue callback optimization
...
* Moved all priority queue access to helper functions to improve reliability and readability
* New version of CSJ2K.dll (from libomv source tree) that fixes a JPEG2000 comment decoding bug
2009-10-02 16:53:35 -07:00
ce8974539e
Merge branch 'master' into diva-textures
2009-10-02 19:03:22 +01:00
2e1c76f836
Added a default for grid services in standalone.
2009-10-02 07:18:36 -07:00
31d8cec0f8
Merge branch 'master' into diva-textures
2009-10-02 08:23:38 +01:00
18a744cac1
Change texture sending to be driven by the queue empty event from the
...
packet queue, rather than a timer
2009-10-02 04:04:14 +01:00
6e0c79b8fe
* Rewrote LLImageManager to use a real priority queue and hold minimal state
...
* Rewrote the logic in J2KImage.RunUpdate()
* Added a default avatar texture (I made it myself)
2009-10-01 17:42:13 -07:00
d0bf084da5
Remove the settings for the J2KDecoder, since they are now obsolete (thank god!)
2009-09-30 21:31:48 +01:00
f56dc5fcda
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
...
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
* Renamed IJ2KDecoder and J2KDecoder member names to follow standard naming conventions * Removed j2kDecodeCache cruft and replaced it with the OpenSim cache system * Rewrote the default layer boundary algorithm to use percentages instead of an exponent * Switched from an infinite in-memory cache to an expiring cache (10 minute timeout) * Slightly quieted logging errors for failed texture decodes
2009-09-30 19:26:53 +01:00
f908e32f62
Revert "Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug"
...
This reverts commit 22cc31135e
2009-09-30 19:26:26 +01:00
22cc31135e
Attempting to improve the robustness of texture decoding by always ignoring LayerInfo.End values and creating guessed default layer boundaries on failed decodes Changed a noisy J2K decode log message from Info to Debug
...
Replacing openjpeg-dotnet decoding with managed CSJ2K decoding. Should be much more reliable, faster, and use less memory
* Re-added openjpeg-dotnet files since they are used elsewhere in OpenSim * Updated prebuild.xml with a reference to CSJ2K
2009-09-30 18:42:45 +01:00
b1d204802f
Minor bug fixes.
2009-09-29 16:13:07 -07:00
de48113962
Added GridService section to OpenSim.Server.ini.example
2009-09-28 06:08:35 -07:00
8b2b8801e6
Fixed port in GridServer.ini. Added new configs for StandaloneHypergrid.ini
2009-09-27 14:32:03 -07:00
368ae02dc9
Corrected the port number to 8001 in the test client and grid ini.
2009-09-26 10:18:22 -07:00
ae222140ca
Finished spec-ing the .inis for the new grid service modules.
2009-09-26 10:08:59 -07:00
632bb71262
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
...
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
2009-09-26 08:49:48 -07:00
be7afa0b1f
Changed a [Groups] config as per mcortez' request.
2009-09-25 08:44:26 -07:00
6a5d7650d0
All tests pass for MySQL/MySQLRegionData.
...
Added OpenSim.GridServer.ini.example that I have been using for testing the ROBUST grid service with the GridClient.
2009-09-24 18:23:55 -07:00
67276589c8
Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
...
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
b8f039897b
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2009-09-23 15:40:35 -07:00
35deff7ec4
Modules active. Tested HGGridConnector in standalone only for now. Modules commands work.
2009-09-23 09:27:01 -07:00
160277db69
Removing the overlooked .exe.config files for the deleted servers
2009-09-23 15:24:27 +01:00
97c18caa76
Thank you, Intari, for a patch that implements the missing pieces of
...
Http-in and makes the host name for URL generation configurable.
Applied with changes:
llGetSimulatorHostname was not changed, because the change breaks
existing behavior and carries a data exposure risk. That value needs
to be configurable, the proposed fixed change is not acceptable.
2009-09-22 17:04:34 +01:00
70358ddb8d
remove old OpenSim.Services.ini.example (replaced by OpenSim.Server.ini.example)
2009-09-18 19:40:53 +01:00
c718949758
Remove old OpenSim.Example.xml file that doesn't keep up with OpenSim.ini.example
...
This to try and make things a tiny bit simpler
Please just put it back if this causes issues, at which point we can comment it to say what it's for
2009-09-18 19:24:49 +01:00
077d01c225
switch default physics engine to ODE and default meshmerizer to Meshmerizer in code and in OpenSim.ini.example
2009-09-16 18:44:55 +01:00
a964bc3ca4
Apply http://opensimulator.org/mantis/view.php?id=4142
...
Re-enable XMLRPC scripting calls
Moves XMLRPC scripting setup to a separate section
Thanks Fly-Man-
2009-09-14 18:31:34 +01:00
38e462ed8a
* Milestone GridFriendly reached so Adding CombineContiguousRegions to the OpenSim.ini.example
2009-09-13 07:27:24 -04:00
f20a052ef5
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
2009-09-11 18:20:41 +01:00
e7934c9da0
minor: correct my name in one of the library bundled scripts
2009-09-11 12:04:40 +01:00
ce332f235c
Changed the interface of IAuthorizationService to get less data.
2009-09-10 19:56:08 -07:00
953ef780c5
adding in working functionality for the remote connector
2009-09-10 17:52:42 -07:00
16940097be
The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested.
2009-09-10 17:51:28 -07:00
07a9d9f2e9
Deleted assets/OpenSimAssetSet, because it had 6M of data that was not being used anywhere.
2009-09-06 18:29:37 -07:00
bb1d4d23c4
Change the loader to actually load the user service data module
2009-09-06 04:44:08 +01:00
67f803c919
Add the new AuthStore to migrations. Update OpenSim.Server.ini
2009-09-04 08:10:05 +01:00
6b70b57099
* Add extra warning about using -pass in OpenSim.ConsoleClient.ini.example
2009-09-03 20:00:18 +01:00
bc6b4c5bf6
document options in OpenSim.ConsoleClient.ini.example
2009-09-03 19:56:05 +01:00
2ddb73f5f3
update documentation in OpenSim.ini.example for j2k decode cache expiration time
2009-09-01 23:42:31 -07:00
953581698d
- making font name used by VectorRenderModule configurable: can be set
...
via
[VectorRender]
font_name = "Comic Sans MS"
in OpenSim.ini
- adding osSetFontName OSSL function
2009-08-31 10:30:10 +02:00
1a6b30e092
Add a slow cache cleaner thread. By default, the thread starts a cleanup
...
sweep every 10 minutes. If any texture data is older than 12 hours, it is
regenerated and the memory cache is refreshed. After each decode, the thread
delays for 5 seconds.
2009-08-29 05:54:38 +01:00
4b2e62fd3c
Make the j2kDecodeCache expire after 50 minutes (configurable). Alse allows
...
setting the path for it. This commit introduces NEW DEFAULT BEHAVIOR. To
retain the old behavior (eternal cache) you will need to change your OpenSim.ini
and set the timeout to 0.
2009-08-29 04:35:18 +01:00
7ff4c2e50b
Pull out distinct cache system folders and drop cache methods in InventoryCache
2009-08-28 17:07:17 +01:00
5bed0ba09b
Add optimization comment suggestions for FlotsamCache MemoryCacheTimeout as suggested by Whitestar. Thanks!
2009-08-27 21:43:24 +01:00
a7917b428a
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2009-08-25 16:13:02 -04:00
6bdb2e2848
Patch from jhurliman to HttpServer
...
Fixes cookie handling and header name casing in HttpServer
Currently, cookies are never being processed on incoming HTTP requests. This patch makes sure cookies are parsed and inserted into IHttpRequest.Cookies, and fixes incoming headers to always have lower-case names.
http://opensimulator.org/mantis/view.php?id=4052
2009-08-25 16:12:03 -04:00
b03eeeb9f6
* Fixes mantis http://opensimulator.org/mantis/view.php?id=4044 . Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
...
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
465d1095dd
Added new OpenSim.ini setting: "client_throttle_max_bps" which overrides user's viewer network throttle settings
2009-08-18 17:06:14 -07:00
cd3b7bcb03
* Update HTTP Server with jhurliman's longheader fix. Changes 1024 with 4096.
2009-08-18 01:19:01 -04:00
eb78ac343e
Apply http://opensimulator.org/mantis/view.php?id=3538
...
Add ability to silence IRC relay of region joins and quits from certain users
This is useful for admins who wish to remain hidden, or service bots.
Thanks RemedyTomm
2009-08-17 19:48:32 +01:00
Melanie