Justin Clark-Casey (justincc)
9e4153f16b
Hack our copy of Prebuild to just delete the dlls and mdbs in Physics, so as to leave the new config file
2011-08-30 23:17:02 +01:00
Robert Adams
b705ad477e
BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.
2011-08-30 13:49:50 -07:00
Robert Adams
b281163457
BulletSim: add .so for 64 bit Linux. Move .config file to where it will be read.
2011-08-30 13:19:53 -07:00
Robert Adams
21708b832b
BulletSim: add mesh representation. Use meshes for static objects and switch to hulls for physical objects.
2011-08-26 15:51:21 -07:00
Mic Bowman
23f10f1d22
Merge branch 'master' into bulletsim
2011-08-26 15:23:46 -07:00
Justin Clark-Casey (justincc)
2307d9a2f9
minor: Add explanative text for the new currency parameter. Convert some tabs to spaces
2011-08-22 00:58:11 +01:00
Mic Bowman
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
Justin Clark-Casey (justincc)
a0a0c64cb1
Get rid of HttpServer.dll to avoid confusion since we use HttpServer_OpenSim.dll (patched version) instead
2011-08-19 03:02:17 +01:00
Robert Adams
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
Justin Clark-Casey (justincc)
eb431f91c0
Add terminating quotes to http addresses in [SimulatorFeatures] section of OpenSim.ini.example.
...
As per http://opensimulator.org/mantis/view.php?id=5638 . Thanks DutchGlory.
2011-08-16 21:50:15 +01:00
Justin Clark-Casey (justincc)
96ee87e39b
Change the default standalone asset cache to be the Flotsam asset cache (with memory caching not enabled).
...
This matches the GridCommon setting and is the best tested setting. It appears to work fine on standalone.
Also, add information that the flotsam asset cache is the recommended cache, since it is most used and actively maintained.
2011-08-16 21:38:51 +01:00
Justin Clark-Casey (justincc)
e29e50798a
minor: Add warning to OpenSim.ini.example about bullet plugins not working right now, pending the new plugin
2011-08-16 21:31:48 +01:00
Snoopy Pfeffer
70ea625447
Added optional Login Service parameter "Currency" to be able to change the currency name shown in the viewer.
2011-08-14 18:20:20 +02:00
Snoopy Pfeffer
e19843a0ee
WorldMap: Added map item for Land-for-Sale. Implemented backlist item timeouts (default 10 minutes; see also new config file setting BlacklistTimeout) and removing backlisted neigboring regions that have been restarted from the blacklist.
2011-08-14 17:45:23 +02:00
Mic Bowman
c3f579046c
Merge branch 'master' into bulletsim
2011-08-05 11:13:02 -07:00
Robert Adams
7640b5abf6
BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning
2011-08-05 11:01:27 -07:00
Justin Clark-Casey (justincc)
c1c0d780ee
correct config comments mistakes
2011-08-03 04:36:25 +01:00
Justin Clark-Casey (justincc)
797def8aa4
Put config to enable disable [NPC] module.
...
Default is disabled. You will need to explicitly enable to toy with this.
2011-08-03 04:33:45 +01:00
Justin Clark-Casey (justincc)
59f548cda8
Get osNpcCreate appearance working with avatars that are currently in the scene.
...
Had to stop using AvatarService for now since it doesn't store baked texture IDs (which is why this was failing).
Also failing because cloning appearance was also cloning the AvatarApperance.Owner field, which we weren't then changing.
Extended TestCreate() to check this.
2011-08-01 23:41:29 +01:00
Justin Clark-Casey (justincc)
835352aee9
Make it clearer what the save_crashes setting in [Startup] actually does.
2011-07-30 01:05:30 +01:00
Robert Adams
a95f2fe4b3
BulletSim: Update dlls
2011-07-25 10:11:55 -07:00
Justin Clark-Casey (justincc)
ea58aee338
Change default AllowScriptCrossings config setting to true.
...
When this setting is false and other defaults haven't been changed, scripts entering the simulator from another sim are automatically restarted but their state is not preserved.
When this setting is true, state that accompanies the script is reloaded (e.g. if a script had a variable i = 1 when leaving the source region, it will still have i = 1 on the destination region).
This setting does not affect crossings when regions are run in the same simulator. In this case, state is already preserved.
2011-07-23 02:31:00 +01:00
Makopoppo
4eaca4884e
Fixed serverside_object_permission default value confliction
2011-07-23 02:26:13 +01:00
Justin Clark-Casey (justincc)
f0895028e9
Remove manually permissions settings on all current library items so that they use the defaults instead.
...
Some items had completely wrong permissions - this is easier than correcting them all.
The ability to set permissions in xml is retained since there are use cases for this (e.g. to create no-mod library scripts)
2011-07-23 02:13:11 +01:00
Justin Clark-Casey (justincc)
fcaa4f6012
Revert "Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default)."
...
There actually are uses for this. I will correct the perms instead since some entries appear to be wrong.
This reverts commit 667b54f5a2
.
2011-07-23 02:05:51 +01:00
Justin Clark-Casey (justincc)
667b54f5a2
Don't load current/next/everyone/base permissions from the library item xml files - always use PermissionMask.All instead (which was the existing default).
...
Library items always need the same permissions, so it doesn't make sense to load them from the xml files. This just opens the door to permissions mistakes.
2011-07-23 01:59:14 +01:00
Robert Adams
869883f2dc
BulletSim: fix buoyancy for prims. Start of configurable physics parameters.
2011-07-22 15:23:57 -07:00
Robert.Adams
5ffec1cd64
Pass collisions and updates in pinned memory (saves marshaling).
...
Fix folding feet by using collision normals.
Add constraint specification.
2011-07-22 10:23:40 -07:00
Mic Bowman
4cbc912375
Merge branch 'master' into bulletsim
2011-07-22 09:02:32 -07:00
Justin Clark-Casey (justincc)
6426492da0
remove the windows debugging symbols for the long protobuf-net
2011-07-21 03:24:20 +01:00
Justin Clark-Casey (justincc)
630e11cbe1
remove dead MXP default symbols. The MXP code is long, long gone.
2011-07-21 03:22:27 +01:00
Justin Clark-Casey (justincc)
e1ce106790
make [SMTP] default comment option match actual default
2011-07-21 03:21:19 +01:00
Justin Clark-Casey (justincc)
0a09c45726
minor: group all the map tile options together
2011-07-21 03:18:10 +01:00
Justin Clark-Casey (justincc)
d2d67a1abf
remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini
2011-07-21 03:14:43 +01:00
Justin Clark-Casey (justincc)
69c2d3434a
minor: remove the pointless quotes from the GenerateMaptiles option
2011-07-21 03:13:54 +01:00
Justin Clark-Casey (justincc)
1c758ae01c
make default TextureOnMapTile true for the older map imager
...
Don't know of a good reason not to do this, seems to work fine.
2011-07-21 03:08:58 +01:00
Dan Lake
2c11f7fc38
Merge branch 'master' into bulletsim
2011-07-20 15:01:32 -07:00
Justin Clark-Casey (justincc)
bf1b8397bb
Add a warning to URI config in GridCommon.ini.example not to add a slash to the end.
...
Tidy up GridCommon.ini.example
2011-07-12 23:35:06 +01:00
Dan Lake
b9cbe92f30
Merge branch 'master' into bulletsim
2011-07-11 12:23:20 -07:00
Robert Adams
51d6c58d10
Checkin 32 bit bulletsim shared library for Linux.
2011-07-11 12:23:00 -07:00
root
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
Justin Clark-Casey (justincc)
2fbc98fa5c
Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap)
2011-07-07 23:37:23 +01:00
root
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
Justin Clark-Casey (justincc)
bebc51a6e0
Make it possible to disable the file part of the flotsam asset cache
...
This matches the ability to disable the memory part
This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini
Default is true, so existing installations are not affected.
Improved fcache command feedback when various caches are disabled.
Re-enabled test for flotsam cache with file caching disabled.
2011-07-04 22:51:47 +01:00
Justin Clark-Casey (justincc)
fba961c63f
Make default serverside_object_permissions = true since this better matches user expectations.
...
It also matches the default setting in the OpenSim.ini.example file
2011-07-01 23:06:46 +01:00
Justin Clark-Casey (justincc)
a9b7487fcb
improve and tidy up some config file comments
2011-06-30 22:36:41 +01:00
Justin Clark-Casey (justincc)
03feb50a72
minor: adjust some indentation and spacing in OpenSim.ini.example for consistency
2011-06-30 20:26:17 +01:00
root
5f927dc104
Merge branch 'master' into careminster-presence-refactor
2011-06-30 00:26:03 +01:00
Makopoppo
e11c959400
[PATCH] Changed Wind parameters default value in OpenSim.ini.example
...
according to implementation
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-06-28 11:48:28 -04:00
Justin Clark-Casey (justincc)
23bf773dea
For an initial test, add 64 bit shared object bullet libraries built under Linux. These are not yet hooked up.
...
I'm not sure which one you actually need, Robert, so please prune as appropriate. I haven't tested or hooked these up in any way yet.
2011-06-27 00:29:01 +01:00
Justin Clark-Casey (justincc)
698cd0b3c2
Remove the now unused [cms] section from OpenSimDefaults.ini
2011-06-25 01:33:09 +01:00
Oren Hurvitz
0dd3281caf
Optionally, don't delete previously compiled scripts on startup
2011-06-24 22:07:20 +01:00
Justin Clark-Casey (justincc)
de20f0603f
Tell hypergridders when their teleports fail because of the 4096 limit rather than just saying "destination not found"
...
Instead of performing the 4096 check when the region is linked (and subsequently removing the link), leave the link in place and perform the check in the entity transfer module
This allows us to explicitly tell the hypergridder why the teleport failed (region out of range).
It also allows people on regions that are within range (on a large source grid) to teleport.
The Check4096 config parameter in the [GridService] section is replaced by a max_distance paramter in a new [EntityTransfer] section in OpenSimDefaults.ini
Since the parameter is in OpenSimDefaults.ini no action needs to be taken unless you want to increase this limit. It could also be decreased.
The check is being made in the base entity transfer module, since I believe the viewer problem occurs both on extremely large grids and while hypergridding.
2011-06-24 19:49:05 +01:00
Robert Adams
7974349262
Initial BulletSim.dll commit
2011-06-20 17:28:53 -07:00
Melanie
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
Diva Canto
bbe489e64a
Added missing config var for map image service.
2011-06-15 11:11:14 -07:00
Diva Canto
822b9e085f
Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response.
...
Changed the experimental capability introduced a couple of commits ago: now sending that extra information as part of the response in the SimulatorFeatures cap.
2011-06-13 10:21:29 -07:00
Diva Canto
ecb28ae130
V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes
2011-06-13 09:13:44 -07:00
Diva Canto
0e4db3ca39
Added experimental new capability URL called MapImageService meant to work with Kokua viewer if devs are willing to do it.
2011-06-13 07:56:52 -07:00
Melanie
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
Diva Canto
07d7c1cd2d
Trailing / in MapTileURL must be there!
2011-06-12 18:29:44 -07:00
Diva Canto
fd57c91b4a
First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD.
2011-06-12 15:37:42 -07:00
Melanie
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
Justin Clark-Casey (justincc)
39e878eb8f
Align CenomeCache.ini.example values with CenomeCache defaults.
2011-06-11 00:35:31 +01:00
Justin Clark-Casey (justincc)
c7cef650db
Make it clear that WaitOnInprogressTimeout is currently a dead setting in FlotsamCache.ini.example
2011-06-11 00:10:40 +01:00
Justin Clark-Casey (justincc)
b13b54c526
Make the internal flotsam asset cache defaults match config-include/FlotsamCache.ini.example. Enable the flotsam console commands even if FlotsamCache.ini isn't present.
...
For the most part, defaults are made to match those already in FlotsamCache.ini.example.
The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file. This can be tweaked if necessary.
Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default).
Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
2011-06-11 00:04:21 +01:00
Makopoppo
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
Melanie
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
Diva Canto
f5d82350bb
This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully.
2011-06-07 10:51:12 -07:00
Diva Canto
e77ca65e57
This should make offline IMs work again. It should work for incoming foreign IMs where the local recipient is offline. I can't test any of this, because I don't run an offline IM server.
2011-06-06 17:46:34 -07:00
Diva Canto
4ea89f39f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-03 10:32:21 -07:00
Diva Canto
7772640ae8
.ini.example's updated for HG Landmarks
2011-06-03 10:29:59 -07:00
Justin Clark-Casey (justincc)
dfa4442319
Move the "!!!Standalone Only!!!" [FreeswitchService] section from OpenSim.ini.example to config/StandaloneCommon.ini.example where it belongs.
2011-06-02 22:43:44 +01:00
Justin Clark-Casey (justincc)
b8e2ee6978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-02 21:48:50 +01:00
Justin Clark-Casey (justincc)
b000d4f67f
minor: add ini.example doc to hint that the server address in [FreeswitchService] must be reachable by viewers
2011-06-02 21:37:17 +01:00
Diva Canto
46cdd442a8
[Profiles] --> [Profile]
2011-06-01 18:18:31 -07:00
Justin Clark-Casey (justincc)
c4b265aeae
update libomv libraries to 0.9.0
...
this is a prerequisite to fixing llDialog issues for the latest Linden viewers, since they are now making use of a new OwnerData field in the ScriptDialog message
2011-05-31 18:47:13 +01:00
Makopoppo
7ea6dfecd9
Adding MSSQL connectionString example
2011-05-30 23:22:52 +01:00
Makopoppo
d671dbb7c7
Removing mssql_connection.ini.example - mssql_connection.ini is no longer used
2011-05-30 23:22:49 +01:00
BlueWall
16fae059bb
Comment the alert_uri so it remains disabled until set
2011-05-28 16:40:05 -04:00
BlueWall
3326e417b4
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 16:21:30 -04:00
BlueWall
c7e18f9017
Adding an event to signal that logins are enabled
...
Added an event to signal the eabling of logins and added an alert to send to a configured service.
2011-05-28 16:20:10 -04:00
BlueWall
d2c2a4301b
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 00:39:21 -04:00
BlueWall
99f42c0a6e
Add option to disable logins
...
This just covers script loading for now. More to come.
2011-05-28 00:35:06 -04:00
Diva Canto
44d5821c4e
Fixed one comment in a config file.
2011-05-27 13:35:22 -07:00
Diva Canto
76525be7b2
HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example
2011-05-27 13:07:18 -07:00
Diva Canto
36f9d55c36
Added a BasicProfilemodule so that the profile-based actions (like give inventory, etc) work. This is just a mock profile, the same for all users, and with no DB backend behind it -- meaning that nothing will be saved. For serious profiles, use 3rd party implementations.
2011-05-27 07:00:36 -07:00
Diva Canto
31d07859f9
Added missing config vars to StandaloneCommon.ini.example and fixed the ones in Robust.HG.ini.example
2011-05-26 19:43:24 -07:00
Diva Canto
abae859e7a
Added missing configuration variables to Robust.HG.ini.example
2011-05-26 19:20:29 -07:00
Diva Canto
07acb4d321
Last commit before pushing. WARNING: (a) DB migration on the friends table; and (b) several config additions related to HG. See Robust.HG.ini.example, GridCommon.ini.example and/or StandaloneCommon.ini.example.
2011-05-26 19:15:39 -07:00
Diva Canto
0c58a9e680
HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service.
2011-05-26 10:04:48 -07:00
Diva Canto
5c2168cae7
HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.
2011-05-25 12:32:21 -07:00
Diva Canto
e19031849e
Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service.
2011-05-24 09:38:03 -07:00
Diva Canto
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
Diva Canto
336665e035
More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back.
2011-05-22 16:51:03 -07:00
Diva Canto
d21e9c755f
HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
2011-05-19 16:54:46 -07:00
Melanie
f9203ca7e0
Add a message packing library to binary-pack AgentCircuitData for faster
...
teleporting
2011-05-17 22:38:45 +02:00
Melanie
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +01:00
Justin Clark-Casey (justincc)
5f9edd195c
Fix broken inventory links on viewer 2.
...
It appears that if the viewer requests a folder containing links, we must also send the folders that contain the link targets first.
This was tested with Kokua 0.1.0 WIP though I predict it will also work with other viewer 2s
2011-05-13 03:24:19 +01:00
E. Allen Soard
279ed08de1
Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.
2011-05-09 03:14:48 +01:00
E. Allen Soard
939026d874
Incremental patch to add config options to enable/disable the prim limits module to OpenSim.ini. EnforcePrimLimits is set to false by default to emulate the current behavior.
2011-05-09 02:35:32 +02:00
Melanie
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
BlueWall
d40e4562f2
Add missing configs for ssl in Robust.HG.ini
2011-05-07 18:54:21 -04:00
Justin Clark-Casey (justincc)
7c3e8a106b
Merge branch 'master' of https://github.com/allquixotic/opensim-autobackup
2011-05-06 20:51:55 +01:00
BlueWall
8ca7938753
Adding ssl support
...
Adding ssl support for "Out of Band" applications such as the remote
admin module or Robust services
2011-05-05 19:56:54 -04:00
Melanie
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
Diva Canto
98b84802e4
Changed the defaults, so that it behaves exactly is it has been behaving (no WebFetch cap by default).
2011-05-02 20:19:36 -07:00
Sean McNamara
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
Diva Canto
f10666c7ba
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
2011-05-01 10:07:54 -07:00
Melanie
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
Justin Clark-Casey (justincc)
5e3893ca5c
add the executable bit to all bundled DLLs so that these are preserved when using git or untarring releases under cygwin on windows
...
Mono doesn't care if the
2011-04-27 23:57:26 +01:00
Diva Canto
e0576b56d3
Thank you Snoopy for a patch that adds some filtering to client versions allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples.
2011-04-27 07:02:37 -07:00
Justin Clark-Casey (justincc)
1b43c05c3d
Change default ini.example port used by Freeswitch in grid settings to 8004.
...
This is to facilitate running Freeswitch in a separate ROBUST shell, as on grid setups there can be quite a lot of traffic flowing between FreeSWITCH and ROBUST. However, running in a spearate shell is not mandatory.
2011-04-27 02:05:16 +01:00
Justin Clark-Casey (justincc)
d722f22102
adjust freeswitch grid connector to port 8003 to agree with the default 8003 used in OpenSim.ini.example
...
Adjusting to 8003 seems sensible since this service doesn't need to be exposed to viewers.
2011-04-27 01:53:57 +01:00
Sean McNamara
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
Mic Bowman
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
Diva Canto
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
Melanie
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
Melanie
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
Mic Bowman
024c12abc3
Cleaned up various configuration options. Removed the category throttle
...
limits because the only ones used now are the defaults (which are overwritten
by the client throttles anyway). Updated the default rates to correspond to
about 350kbps.
Also added a configuration to disable adaptive throttle. The default
is the previous behavior (no adaptation).
2011-04-25 10:44:41 -07:00
Diva Canto
0d5a80ad78
Removed unused libraries: RAILS.dll and dependencies.
2011-04-24 19:14:39 -07:00
Diva Canto
35c09cae8c
Removed unused libraries Castle.*
2011-04-24 19:06:48 -07:00
Sean McNamara
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
Sean McNamara
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
E. Allen Soard
44e43d9d24
Added MaxAgents configuration option to RegionConfig.ini allowing region hosters to setup regions maintaining more control over system resources.
2011-04-23 00:40:08 +01:00
Melanie
c411ab54ee
Merge branch 'master' into careminster-presence-refactor
2011-04-22 08:55:12 +01:00
BlueWall
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
BlueWall
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
Melanie
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
BlueWall
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
BlueWall
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
Justin Clark-Casey (justincc)
223c90c751
Remove duplicated freeswitch settings.
2011-04-21 19:31:37 +01:00
Melanie
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
Justin Clark-Casey (justincc)
b786860bac
synchronize Robust.HG.ini.example FreeSWITCH config with other config files
2011-04-19 22:38:43 +01:00
Justin Clark-Casey (justincc)
575257f3fe
For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks for the spot, Ai Austin.
2011-04-19 21:58:55 +01:00
Justin Clark-Casey (justincc)
2fa210243b
Clean up freeswitch config to what is currently required. Add explanation to config parameters. Clean up some log messages.
2011-04-19 21:54:26 +01:00
Justin Clark-Casey (justincc)
36c4e94ef7
Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future config parameters.
...
Default remains true.
OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything.
2011-04-18 23:22:04 +01:00
Melanie
ccf63a9c63
Merge branch 'master' into careminster-presence-refactor
2011-04-18 21:04:09 +01:00
Justin Clark-Casey (justincc)
419fc9427e
Provide a configuration setting to control whether multiple taken objects are coalesced to inventory
...
This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini
Default is true.
2011-04-18 20:03:53 +01:00
Melanie
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
BlueWall
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
Justin Clark-Casey (justincc)
424995e138
Move example HttpProxy setting to OpenSim.ini.example and tidy
2011-04-12 23:22:21 +01:00
Justin Clark-Casey (justincc)
bed463666c
minor typo correction. thanks Ai Austin.
2011-04-12 23:16:43 +01:00
Melanie
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
Justin Clark-Casey (justincc)
333a2913cf
slightly tweak OpenSim.ini.example text
2011-04-11 22:02:12 +01:00
Justin Clark-Casey (justincc)
fda393b088
Add information comment to top of OpenSimDefaults.ini and make file consistent
2011-04-11 21:42:28 +01:00
Justin Clark-Casey (justincc)
e9c2beadec
Add more instructions to OpenSim.ini.example to try and make it more understandable for new users.
2011-04-11 20:43:11 +01:00
Justin Clark-Casey (justincc)
2aa3984796
Update ODE for mac from source code in opensim-libs SVN library. This version is r1755 + patches as detailed in the svn logs.
...
This brings it into line with the Windows and Linux libraries.
This is a universal dylib with x86_64, i386 and ppc parts. However, even on a 64 bit Intel machine Mono can only P/INVOKE the i386 version right now. ppc is untested.
The configuration used to compile was
CFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" CXXFLAGS="-g -O2 -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc" LDFLAGS="-arch i386 -arch x86_64 -arch ppc" ./configure --enable-old-trimesh --disable-asserts --enable-shared --disable-dependency-tracking --disable-demos --without-x
--disable-demos --without-x is required to build ODE on Mac OS X
CFLAGS, CXXFLAGS and --disable-dependency-tracking are necessary to build the universal dylib (some compilation lines use CFLAGS instead of CXXFLAGS)
The other settings are tweaks for using ODE with OpenSim
2011-04-08 20:50:23 +01:00
Melanie
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
Justin Clark-Casey (justincc)
9ba787be67
Remove old SQLite library
2011-04-08 00:33:33 +01:00