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
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
Melanie
c0d3ab59e6
Remove old Freeswitch configurations
2010-12-07 15:30:10 +00:00
Melanie
c8f0c8ebc4
Remove old Freeswitch configurations
2010-12-07 15:24:17 +00:00
Melanie
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
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
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
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00: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
Melanie
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
Melanie
c4eb430ad2
Merge branch 'master' into careminster-presence-refactor
2010-11-16 21:15:15 +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
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +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
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
mores
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
Melanie
26f12f479f
Merge branch 'master' into careminster-presence-refactor
2010-11-02 22:58:33 +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
69c1e0b2f7
Merge branch 'master' into careminster-presence-refactor
2010-10-29 21:22:35 +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
840b75ca9b
Add my work on top of cmickeyb's
2010-10-29 20:48:37 +02:00
Melanie
3231602b88
Revert "Preliminary work on appearance layers. No user functionality yet."
...
This reverts commit e6a8d2872c
.
2010-10-29 20:34:53 +02:00
Melanie
bd4e3b0aaf
Add a default alpha layer
2010-10-29 20:31:17 +02:00
Melanie
9c829c0410
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:58:22 +01:00
Melanie
e6a8d2872c
Preliminary work on appearance layers. No user functionality yet.
2010-10-29 18:59:53 +02:00
Master ScienceSim
68666efd25
Configuration of persistent baked textures and save/send delays.
2010-10-28 12:00:04 -07:00
Melanie
ac370cf57b
Merge branch 'master' into careminster-presence-refactor
2010-10-25 01:24:30 +01: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
Melanie
bb7a755cba
Merge branch 'master' into careminster-presence-refactor
2010-10-18 20:30: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
Melanie
46e5c8e919
Merge branch 'master' into careminster-presence-refactor
2010-10-16 10:52:56 +01:00
Melanie
455a2ba7de
Merge branch 'master' into careminster-presence-refactor
2010-10-16 02:27:51 +01: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
bb1e35fbd9
Merge branch 'master' into careminster-presence-refactor
2010-10-13 18:44:58 +01: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
Melanie
cb79e228e4
Merge branch 'master' into careminster-presence-refactor
2010-10-10 22:08:36 +01:00
Diva Canto
78f6fe0b31
Added missing sections to StandaloneHypergrid.ini
2010-10-09 09:09:16 -07:00
Melanie
231feab57f
Merge branch 'master' into careminster-presence-refactor
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
2010-10-09 01:07:41 +01: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
Melanie
d8149373c1
Merge branch 'master' into careminster-presence-refactor
2010-10-06 00:27:10 +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
da6816c805
Merge branch 'master' into careminster-presence-refactor
2010-10-04 04:49:54 +01: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
c19ac997b1
Merge branch 'master' into careminster-presence-refactor
2010-10-04 01:08:11 +01: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
6ba7ee6b2e
Update libOMV
2010-10-04 00:44:27 +01:00
Melanie
766ce9a141
Add linden prim renderer and update libOMV
2010-10-04 00:10:08 +01:00
Melanie
50b03d08a8
Add linden prim renderer and update libOMV
2010-10-04 00:04:42 +02:00
Melanie
48988bf4e9
Merge branch 'master' into careminster-presence-refactor
2010-10-03 22:38:32 +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
Melanie
b4fe6da4eb
Add the Warp3D dll
2010-10-03 16:57:45 +01:00
Melanie
fd56fd2ce8
Merge branch 'master' into careminster-presence-refactor
2010-10-02 19:51:43 +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
Melanie
9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
Melanie
14db53b723
Another typo fix
2010-09-26 18:35:15 +01:00
Melanie
6f689f591a
Merge Master
2010-09-26 17:56:31 +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
Melanie
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +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
9f7aa7deef
Add LandServices to make landmarks work right in grids
2010-09-17 21:40:49 +01:00
Melanie
58b1ee8e2c
Merge branch 'master' into careminster-presence-refactor
2010-09-16 18:04:50 +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
Melanie
1212cb0c74
Merge branch 'master' into careminster-presence-refactor
2010-09-14 22:03:42 +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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Melanie
51411d5664
add the missing ini example
2010-09-14 00:32:49 +01:00
John Hurliman
1654e27cda
Renamed OpenSimDefaults.ini.example to OpenSimDefaults.ini
2010-09-13 16:23:22 -07:00
Melanie
0de2f0567d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-13 23:28:36 +01:00
Melanie
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
Melanie
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
John Hurliman
2ed276eb47
Adding missing ConnectionString lines to [DatabaseService] sections for SQLite configs
2010-09-13 11:39:58 -07:00
Melanie
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
John Hurliman
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
29708e47a5
Merge branch 'prebuild-update'
2010-09-10 22:38:56 +01:00
Diva Canto
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
John Hurliman
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
John Hurliman
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
John Hurliman
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
Melanie
e4c2b44e5c
Merge branch 'master' into careminster-presence-refactor
2010-09-05 15:06:00 +01:00
Diva Canto
9fd9836841
Make User Agent Service and Login Service separable.
2010-09-04 16:39:03 -07:00
BlueWall
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
Diva Canto
8fc68c6d98
Added XFF header processing. Untested, for lack of proxy.
2010-09-03 17:18:53 -07:00
Justin Clark-Casey (justincc)
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
John Hurliman
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
Melanie
79bfa275da
Merge branch 'master' into careminster-presence-refactor
2010-08-30 02:30:28 +01:00
Diva Canto
3c71e5a3a2
Deleted Check4096 from Robust.ini.example
2010-08-26 18:23:16 -07:00
Justin Clark-Casey (justincc)
fe660cd2cc
Rename Newtonsoft.Json.dll to properly reflect its actual assembly name
2010-08-26 18:11:01 +01:00
Melanie
252e159340
Merge branch 'master' into careminster-presence-refactor
2010-08-25 23:22:23 +01:00
Diva Canto
a2113ecc71
Typo
2010-08-24 21:01:37 -07:00
Melanie
1bfec00a88
Merge branch 'master' into careminster-presence-refactor
2010-08-23 23:55:15 +01:00
Melanie
8d8436e0ca
Correct a minor typo
2010-08-21 20:59:25 +01:00
Melanie
f8ff98577e
Merge branch 'master' into careminster-presence-refactor
2010-08-21 00:32:26 +01:00
Ai Austin
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
Justin Clark-Casey (justincc)
a87840bd1c
Make some small corrections to ini.example file changes. These are not functional changes.
2010-08-20 18:25:44 +01:00
Ai Austin
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
Melanie
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
Melanie Thielker
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
Melanie
77705145a0
Merge branch 'master' into careminster-presence-refactor
2010-08-19 11:47:50 +01:00
Diva Canto
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
Justin Clark-Casey (justincc)
8c12f22140
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-08-18 23:15:25 +01:00
Justin Clark-Casey (justincc)
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
Melanie
e74809ff4c
Merge branch 'master' into careminster-presence-refactor
2010-08-18 00:59:20 +01:00
John Hurliman
e1f2c32284
* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecasts going in the other direction
2010-08-17 12:26:20 -07:00
John Hurliman
53190e332d
Updated to new OpenMetaverse.StructuredData.dll that includes implicit typecasts
2010-08-17 12:04:37 -07:00
meta7
df9521caf3
Add ini.example section for the MOTD module.
2010-08-11 15:30:42 -07:00
Melanie
321e1148da
Merge branch 'master' into careminster-presence-refactor
2010-08-08 18:24:33 +01:00
Diva Canto
a87dbe198c
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
2010-08-08 09:51:17 -07:00
Diva Canto
1314c87f36
Enabled GridInfoServiceInConnector for standalones.
2010-08-08 09:50:41 -07:00
Melanie
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
Melanie Thielker
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
Melanie Thielker
97f8175090
Delete some files from bin that should not have been committed
2010-08-07 18:34:11 +02:00
sacha
047a4764f2
and another one...
2010-08-07 13:19:53 +00:00
Melanie
8fd3f6cf7f
Merge branch 'master' into careminster-presence-refactor
2010-08-07 05:41:41 +01:00
Diva Canto
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
Diva Canto
6321d85ebf
These files want to be committed -- white space weirdness.
2010-08-06 11:00:25 -07:00
Melanie
26387252f5
Merge branch 'master' into careminster-presence-refactor
2010-08-06 18:08:40 +01:00
Justin Clark-Casey (justincc)
1270727c96
Merge branch 'moap'
2010-08-06 18:29:30 +01:00
Kitto Flora
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
Kitto Flora
cb3b124df9
Fixes fresh hollowed prim collision shape.
2010-08-04 21:08:00 +00:00
Melanie
757929012e
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:11:47 +01:00
Melanie
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
Melanie
164719119b
Merge branch 'master' into careminster-presence-refactor
2010-08-04 01:01:08 +01:00
Melanie
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
Melanie
e12993ed22
Merge branch 'master' into careminster-presence-refactor
2010-08-04 00:33:02 +01:00
Diva Canto
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
Tom
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
Melanie
7a9e246ccd
Merge branch 'master' into careminster-presence-refactor
2010-07-29 16:20:59 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
4d23749241
provide config option for media on a prim
2010-07-26 23:34:23 +01:00
Melanie
7b471bb21c
Adding sample configuration to previous patch
2010-07-22 03:04:34 +01:00
Melanie
686837d9ed
Merge branch 'master' into careminster-presence-refactor
2010-07-20 21:18:27 +01:00
Tom Grimshaw
ef6565470f
XGitminster: Update config options; commitFrameInterval -> CommitInterval and a new option DisableNonEssentialCommits
2010-07-17 06:54:46 -07:00
Diva Canto
b75fc97865
Fixes mantis #4872 . Port for GridInfo was wrong in Robust.HG.ini.example
2010-07-15 03:34:03 -07:00
Melanie
0b74662ce2
Merge branch 'master' into careminster-presence-refactor
2010-07-14 19:53:15 +01:00
Diva Canto
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
Melanie
5f400a50be
Merge branch 'master' into careminster-presence-refactor
2010-07-08 17:32:57 +01:00
Diva Canto
cd19e6fe32
Fixes mantis #4842
2010-07-05 07:38:15 -07:00
Melanie
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
Diva Canto
c117f2144c
Compiled Robust.32BitLaunch.exe to .Net 3.5
2010-07-03 10:40:33 -07:00
Melanie
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
Melanie
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
Diva Canto
20fc35399b
Fixes mantis #4815 and #4812
2010-06-28 14:10:22 -07:00
Diva Canto
7868f1f650
Fixed Robust.32BitLaunch.exe
2010-06-27 13:06:39 -07:00
Tom Grimshaw
5b6485481b
Add extra Gitminster config options to ini.example
2010-06-26 11:02:09 -07:00
Melanie Thielker
6c6c7b0927
Remove libs from main tree
2010-06-26 06:25:03 +02:00
Melanie Thielker
d3d63fe553
remove conflicting pdb debug files
2010-06-26 06:21:38 +02:00
Tom Grimshaw
8daa149c36
Remove the prepending slash from the default git repo name
2010-06-25 13:03:00 -07:00
Tom Grimshaw
3ef70b55e9
Whoops, enabled = true not enabled = 1
2010-06-25 12:58:13 -07:00
Tom Grimshaw
e0d533dc4e
Add [Git] section to OpenSim.ini.example for Gitminster
2010-06-25 12:55:02 -07:00
Tom Grimshaw
94ece2789d
Add some libraries for XGitminster
2010-06-25 12:21:24 -07:00
Melanie
e93853623b
Merge branch 'master' into careminster-presence-refactor
2010-06-24 03:30:11 +01:00
Justin Clark-Casey (justincc)
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
Melanie
04b60aa490
Merge branch 'master' into careminster-presence-refactor
2010-06-19 20:32:01 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey
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
Melanie
0b75f759b4
Merge branch 'master' into careminster-presence-refactor
2010-06-16 04:10:55 +01:00
Diva Canto
07b8eddb64
Typo corrected in Robust.HG.ini.example
2010-06-14 19:11:49 -07:00
Melanie
fdf648bcf3
Merge branch 'master' into careminster-presence-refactor
2010-06-14 02:49:15 +01:00