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
Diva Canto