Diva Canto
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
98af0db8c0
minor: Add some more information to the mesh_sculpted_prim [PHYSICS] setting
2011-02-11 22:16:53 +00:00
Diva Canto
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
Justin Clark-Casey (justincc)
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
Dan Lake
a23ffa2262
Merge branch 'master' from git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-01-30 04:13:20 -08:00
Justin Clark-Casey (justincc)
810f4b9835
Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini
2011-01-28 22:07:35 +00:00
Dan Lake
cf15fc0b97
Merge branch 'master' of git://opensimulator.org/git/opensim into dev
...
Conflicts:
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2011-01-24 20:03:20 -08:00
BlueWall
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
Mic Bowman
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
Robert Adams
e68d9a25b1
Merge branch 'dev' into physics
2011-01-03 15:25:31 -08:00
Dan Lake
0b164072b3
Merge branch 'danmerge_symsync' into dev
2011-01-03 15:13:04 -08:00
Robert Adams
be2af26231
Merge branch 'dev' into physics
...
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/CoreModules/RegionSync/RegionSyncModule/RegionSyncClient.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-01-03 10:47:19 -08:00
Dan Lake
adeab48e7e
Merge branch 'master' into danmerge
2011-01-02 18:38:58 -08:00
Diva Canto
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
Huaiyu (Kitty) Liu
cb49cfe6c5
Added "[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "AttachmentsModule")]" to
...
SymmetricSync modules that implement INonSharedRegionModule. They now start running as a region is loaded.
2010-12-21 13:23:52 -08:00
Diva Canto
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
Diva Canto
d576d7c0a6
Replaced HttpServer_OpenSim.dll with a version that locks certain ops in HttpForm -- mantis #5128 .
2010-12-18 17:36:37 -08:00
Justin Clark-Casey (justincc)
5782f5662b
remove now unused subversion serialization backup config
2010-12-17 23:06:55 +00:00
Justin Clark-Casey (justincc)
490d05d212
remove broken and unmaintained subversion serialization module and it's associated libraries and licenses
2010-12-17 23:04:07 +00:00
Justin Clark-Casey (justincc)
19f70b93a0
tidy up the [Groups] section in OpenSim.ini.example
2010-12-17 21:19:57 +00:00
justincc
b643661938
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-15 00:35:36 +00:00
justincc
d0576f39e0
replace ode.dll with one built without asserts turned on
2010-12-15 00:35:00 +00:00
Robert Adams
7c6bca1668
physics messages sync'ing both ways. Value change not happening
2010-12-14 15:31:00 -08:00
Dan Lake
2b390f2436
Fixed issues with save and retrieve appearance from grid.
2010-12-14 15:06:31 -08:00
Marck
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
Diva Canto
8ea4933742
Fixed wrong configuration variable names.
2010-12-11 18:17:07 -08:00
Justin Clark-Casey (justincc)
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
Dan Lake
c7923338bc
Merge branch 'master' into danmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
bin/OpenSim.exe.config
2010-12-09 15:49:40 -08:00
Dan Lake
dc86adbd17
Fixing up Appearance handling in Region Sync modules and connectors.
2010-12-09 15:07:42 -08:00
Diva Canto
3675bb2981
Make configs consistent, as per mantos #5258
2010-12-09 09:30:17 -08:00
justincc
e9e544ddc8
Update ode.dll to r1755
2010-12-09 03:17:41 +00:00
justincc
0f240a9f7c
Update ode.dll to r1754
2010-12-09 03:16:37 +00:00
Justin Clark-Casey (justincc)
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
Robert Adams
a036426f18
PhysActor update messages working. Avatar and prim neither move nor position correctly
2010-12-08 17:19:06 -08:00
Melanie
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
Justin Clark-Casey (justincc)
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
Diva Canto
f1a7847532
Deleted obsolete config files from old OpenSim.Grid.
2010-12-01 16:19:27 -08:00
Dan Lake
681190f682
Merge branch 'master' into danmerge
...
Conflicts:
.nant/local.include
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
bin/config-include/SimianGrid.ini
prebuild.xml
2010-11-30 17:36:36 -08:00
Diva Canto
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
Diva Canto
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
Melanie
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
Melanie
b43a01179e
Correct an error in Robust.ini.example
2010-11-21 21:35:31 +00:00
Melanie
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
Marck
2368aab534
Fix: Write asset data into Asset.db when using SQLite
2010-11-13 00:31:02 +00:00
Melanie
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
Melanie
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
mores
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
Melanie
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
Teravus Ovares (Dan Olivares)
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
Marck
63bdfb1e28
Clarify comment for configuration option Check4096 and show the default value.
2010-10-30 03:01:27 +01:00
Justin Clark-Casey (justincc)
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
Melanie
4f39329d6f
Rename the new default texture to be consistent with the others
2010-10-29 21:10:19 +01:00
Melanie
32e5bee3a7
Add a default alpha layer
2010-10-29 21:09:31 +01:00
Melanie
934e536738
Merge commit 'cmickeyb/dev-appearance'
2010-10-29 21:06:46 +01:00
Melanie
5f4badf9e2
Add my work on top of cmickeyb's
2010-10-29 20:44:29 +01:00
Melanie
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
Melanie
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
Master ScienceSim
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
Latif Khalifa
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
dahlia
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
Diva Canto
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
dahlia
bcdd03c1cf
more work in progress on mesh physics - still non-functional
2010-10-14 20:25:31 -07:00
Latif Khalifa
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
Latif Khalifa
69dbfe2a69
Updated to libomv-opensim r3449
2010-10-14 15:46:36 +02:00
Teravus Ovares (Dan Olivares)
46738bbd16
Merge branch 'master' of ssh://MyConnection/var/git/opensim
...
Conflicts:
bin/OpenSimDefaults.ini
2010-10-13 20:29:55 -04:00
Teravus Ovares (Dan Olivares)
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
Melanie
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
Diva Canto
78f6fe0b31
Added missing sections to StandaloneHypergrid.ini
2010-10-09 09:09:16 -07:00
Melanie
1e66f79a4e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-08 03:09:04 +01:00
dahlia
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
dahlia
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
Melanie
12bc6a7414
Clarify the format comment at the top of OpenSim.ini.example
2010-10-08 03:08:05 +01:00
Jeff Ames
07122614d5
Formatting cleanup.
2010-10-04 22:44:22 -04:00
Jeff Ames
eeca0ee009
Formatting cleanup.
2010-10-04 17:10:07 -04:00
Melanie
0e7e92b67f
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-10-04 04:49:09 +01:00
Diva Canto
37231e0941
Made the home agent handler check for xff if behind a proxy.
2010-10-03 21:21:02 -07:00
Latif Khalifa
67cfde3fb4
Added Meshmerizer rendering plugin for libomv
2010-10-04 04:48:42 +01:00
Latif Khalifa
adc3cfdcdc
Removed linden renderer
2010-10-04 04:44:33 +01:00
Latif Khalifa
940246f2d5
Use libomv 0.8.4.3445
2010-10-04 04:44:16 +01:00
Diva Canto
934ae03d44
Made the Gatekeeper proxy-able.
2010-10-03 20:35:26 -07:00
Melanie
be301c5815
Add the matching PrimMesher.dll
2010-10-04 01:04:38 +01:00
Diva Canto
eb0cde7959
Replaced OpenMetaverse dlls with ones compiled in Windows.
2010-10-03 17:08:09 -07:00
Melanie
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
Diva Canto
72c1b09d57
Upgraded Mono.Addins.dll to 0.5, coming from here: http://monoaddins.codeplex.com/
2010-10-03 10:35:53 -07:00
Melanie
bda02da152
Add the Warp3D dll
2010-10-03 16:58:22 +01:00
BlueWall
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
Dan Lake
32b9a8d78d
Added missing files to git
2010-09-27 16:00:29 -07:00
Melanie
14db53b723
Another typo fix
2010-09-26 18:35:15 +01:00
BlueWall
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
BlueWall
8afa21cef0
Some cleanup to OpenSimDefaults.ini
...
Fixing a couple of errors
2010-09-26 17:00:56 +01:00
Melanie
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
BlueWall
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
Teravus Ovares (Dan Olivares)
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
Melanie
58f7a083f9
Add LandServices to make landmarks work right in grids
2010-09-17 22:06:43 +01:00
Melanie
f5e3d5a33a
Add the modules include line back that i dropped by mistake
2010-09-15 23:24:58 +01:00
Melanie
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
Melanie
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
Justin Clark-Casey (justincc)
5d48e3c0bb
Revert "Move OpenSimDefaults,ini into config-include in order to put it with all the other default files"
...
This reverts commit c3259e9c26
.
Reverted by agreement.
2010-09-14 03:30:07 +01:00
Justin Clark-Casey (justincc)
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
.
Reverted by agreement.
2010-09-14 03:07:41 +01:00