4e7d4330c2
Expose minimum frame time and update periods for experimentation.
...
Settings are at bottom of [Startup] in OpenSimDefaults.ini, override in OpenSim.ini to change
Defaults are the same as previously.
More information to come on opensim-dev shortly.
Feel free to tweak but if you do please don't expect any support unless feedback on certain tweaks is explicitly requested.
2011-10-13 23:47:37 +01:00
35def547f7
Merge branch 'master' into bigmerge
2011-10-12 16:45:48 +01:00
4b7b9e81f7
Make it possible to disable the HG linker. On non-HG systems it spits yellow
...
spam, so it should not load unless HG is desired.
2011-10-12 15:41:59 +01:00
0faa8db0ef
Update OpenSimDefaults.ini to make the prior state (Groups messaging enabled
...
by default) the config default. This way it will work for current cases while
allowing the use of other groups modules without config bloat.
2011-10-12 09:23:57 +01:00
c9fae6f8a2
Disable Flotsam groups messaging module in our config base
2011-10-12 09:27:48 +02:00
d2dc2316c2
Merge branch 'master' into bigmerge
2011-10-12 09:26:35 +01:00
ad46ad1ab2
Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmerge
2011-10-12 07:23:54 +01:00
1c67c13d77
Merge commit '5551542c286c5db4fa47527c3167bcf539116ada' into bigmerge
2011-10-12 07:09:10 +01:00
2c23fc9e68
Merge commit '4073cd6ced525cb36e4335e79e3f94ad4872b263' into bigmerge
2011-10-12 07:09:04 +01:00
4a284110e6
Merge commit '5bc6503ae1295d00934a5f2ab92484ebcc8513a1' into bigmerge
2011-10-12 07:07:12 +01:00
e3f6344f54
Merge commit 'f1986d54bb3569e6b075b2125e860f31842a60cc' into bigmerge
2011-10-12 01:29:31 +01:00
ae8504f8d9
Merge commit '844b4f3a168a5fb1c19902e1f230f24d677c152f' into bigmerge
2011-10-11 23:15:00 +01:00
20a2b5d63c
Merge commit '6d0978594d1eca9ae56584afe38215f4262256e7' into bigmerge
2011-10-11 23:14:54 +01:00
d1e681f682
Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2011-10-11 23:14:23 +01:00
5536cdf90c
Merge commit '39d7945efc8daa6e5cd0f4728b499e7a624526cd' into bigmerge
...
Conflicts:
OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
2011-10-11 23:01:52 +01:00
d8b78ca498
Merge commit '53646070057c9355bba6df9e181253232d97d8e9' into bigmerge
2011-10-11 22:53:38 +01:00
1b2849319c
Merge commit 'ceb09cde4ddaff6b7e76ce18656f0c2049bcb8ec' into bigmerge
2011-10-11 22:52:15 +01:00
36ec9f0e94
Merge commit '27af016381f2f4aaa8cda99ce7f029980bf8ea76' into bigmerge
2011-10-11 22:22:49 +01:00
b9de3b7f5b
Merge commit 'f95033812402aaf31a9f2f66c946165d2d79669f' into bigmerge
...
Conflicts:
OpenSim/Region/Physics/BulletDotNETPlugin/BulletDotNETCharacter.cs
OpenSim/Region/Physics/BulletXPlugin/BulletXPlugin.cs
prebuild.xml
2011-10-11 22:22:34 +01:00
071c3fe721
Merge commit '6f69ab3bcb932589f102c16b718e7f8964d2c8eb' into bigmerge
2011-10-11 22:15:44 +01:00
45ce8db5db
Merge commit '744602f6d170373882cb31155c8c899b43a5339e' into bigmerge
2011-10-11 22:14:17 +01:00
117d24be54
Merge commit 'c38b25a1d21540fd5be4ae438b38ab67ba88d166' into bigmerge
2011-10-11 21:45:01 +01:00
f1fa059b37
Merge commit 'a00327d0e5f512ccf56e18082c7e7c7366517379' into bigmerge
2011-10-11 21:32:24 +01:00
288f5bd727
Merge commit '37370a8102f066dab1fe3fd9b0b4a7d3541e8b47' into bigmerge
2011-10-11 21:29:38 +01:00
9d22110c23
Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmerge
2011-10-11 21:22:58 +01:00
8114f895c2
Provide a way to turn the MonitorModule on and off
...
Default is currently on since this is the historical setting
2011-10-10 22:17:29 +01:00
5551542c28
Improve explanation of access_ip_addresses in [RemoteAdmin] to say that there are no restrictions if not set
2011-10-08 01:39:27 +01:00
4073cd6ced
Add option to allow only explicitly listed IPs to access RemoteAdmin facilities.
...
Also adds password check to some functions where this was missing and fixes some parameter checking.
This is a patch from http://opensimulator.org/mantis/view.php?id=5715 with a few small unrelated spacing tweaks from me.
Thanks Michelle Argus.
2011-10-08 01:23:26 +01:00
5bc6503ae1
Correct DeleteScriptsOnRestart to DeleteScriptsOnStartup in comments in OpenSim.ini.example
2011-10-07 21:43:52 +01:00
f1986d54bb
Clarify explanation of DeleteScriptsOnStartup switch in [XEngine].
2011-10-04 22:48:28 +01:00
844b4f3a16
copy config information on allow/disallow individual os functions into OpenSim.ini.example
...
I this is generally useful rather than a 'default' setting
2011-09-30 23:55:02 +01:00
6d0978594d
remove unused postgresql dll
2011-09-30 18:58:26 +01:00
e742cffe15
Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to allow attachments to be temporarily turned off.
...
This is for debugging purposes. Defaults to Attachments Enabled
2011-09-30 01:19:22 +01:00
39d7945efc
Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.
...
I added the boolean config setting "allow_regionless", defaulting to false. If set to true, opensim will start up ok if no region configurations are found in the specified region_info_source. It will not ask the user to create a region.
2011-09-24 01:59:02 +01:00
5364607005
Clarify explanation of the "DeleteScriptsOnStartup" config switch and add this to OpenSim.ini.example since it's very useful if you're not updating OpenSim from source.
...
On reflection, "DeleteScriptsOnStartup" isn't a great name since it suggests real script deletion rather than compiled versions.
2011-09-24 00:22:23 +01:00
ceb09cde4d
Correct asset id of library default iris texture.
...
For this change to show up you will need to clear viewer cache.
2011-09-23 21:57:52 +01:00
27af016381
Add BulletSim physics option details to OpenSim.ini.example. Marked as in development and experimental.
2011-09-17 01:13:07 +01:00
f950338124
Remove old bullet DotNET and X libraries in preparation for BulletS
...
These weren't working properly anyway.
You will need to rerun prebuild.sh/.bat after this commit, and maybe "nant clean" as well.
2011-09-17 01:09:25 +01:00
6f69ab3bcb
Add back BulletSPlugin.dll.config that I somehow managed to delete today in a00327d
2011-09-17 00:49:26 +01:00
744602f6d1
Revert "uncomment Standalone config in OpenSim.ini.example."
...
This reverts commit 44a491f36b
2011-09-17 00:10:19 +01:00
c38b25a1d2
Fix base_hair.dat to actually contain the base hair asset rather than base eyes by mistake.
...
I must have had it cached last night.
This now makes completely fresh avatar setups appear properly (remember to wipe viewer cache and server cache as well as database).
As a bonus, eyes now appear by default too!
2011-09-16 21:43:58 +01:00
a00327d0e5
Fix build errors on Windows by adding missing OpenSim.Services.Base reference
2011-09-16 19:54:23 +01:00
37370a8102
On standalone, by default create the necessary minimum body parts and clothes necessary to display a viewer 2 avatar, as implemented in c4efb97d
...
This is controlled by the CreateDefaultAvatarEntries switch in the [UserAccountService] section of config-include/Stnadalone.ini
This is left as false in grid mode
2011-09-16 00:30:37 +01:00
c4efb97d49
Write code to create minimum necessary body parts/clothing and avatar entries to make a newly created user appear as a non-cloud on viewer 2
...
Viewer 2 no longer contains the default avatar assets (i.e. "Ruth") that would appear if the user had insufficient body part/clothing entries.
Instead, avatars always appear as a cloud, which is a very bad experience for out-of-the-box OpenSim.
Default is currently off. My intention is to switch it on for standalone shortly.
This is not particularly flexible as "Ruth" is hardcoded, but this can change in the future, in co-ordination with the existing RemoteAdmin capabilities.
Need to fix creation of suitable entries for users created as estate owners on standalone.
Avatars still appear with spooky empty eyes, need to see if we can address this.
This commit adds a "Default Iris" to the library (thanks to Eirynne Sieyes from http://opensimulator.org/mantis/view.php?id=1461 ) which can be used.
2011-09-15 22:59:29 +01:00
5484c9b585
Bring us up to date.
2011-09-14 19:11:32 -07:00
44a491f36b
uncomment Standalone config in OpenSim.ini.example.
...
This is to make my life easier when creating releases.
I think that it also gives a better story for anybody newly compiling from source.
2011-09-12 20:31:14 +01:00
9f75eaf50e
Fixed BulletSim config files for Linux *.so libraries.
2011-09-04 21:42:33 +02:00
66dec3b874
Resolve merge commits, stage 1
2011-09-04 07:06:36 -07:00
91f59f246f
also get "nant clean" to remove old .mdb from .exe and .dll
2011-08-30 23:20:54 +01:00
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
b705ad477e
BulletSim: update values in OpenSimDefaults.ini to the same as defaults in the source.
2011-08-30 13:49:50 -07:00
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
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
23f10f1d22
Merge branch 'master' into bulletsim
2011-08-26 15:23:46 -07:00
2307d9a2f9
minor: Add explanative text for the new currency parameter. Convert some tabs to spaces
2011-08-22 00:58:11 +01:00
384cb79a1a
Merge branch 'master' into bulletsim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2011-08-19 14:49:16 -07:00
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
fef73a1a10
BulletSim: add runtime setting of physics parameters. Update default values.
2011-08-18 14:32:09 -07:00
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
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
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
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
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
c3f579046c
Merge branch 'master' into bulletsim
2011-08-05 11:13:02 -07:00
7640b5abf6
BulletSim: Parameters settable from ini file. Linksets. Physical property value tuning
2011-08-05 11:01:27 -07:00
c1c0d780ee
correct config comments mistakes
2011-08-03 04:36:25 +01:00
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
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
835352aee9
Make it clearer what the save_crashes setting in [Startup] actually does.
2011-07-30 01:05:30 +01:00
a95f2fe4b3
BulletSim: Update dlls
2011-07-25 10:11:55 -07:00
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
4eaca4884e
Fixed serverside_object_permission default value confliction
2011-07-23 02:26:13 +01:00
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
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
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
869883f2dc
BulletSim: fix buoyancy for prims. Start of configurable physics parameters.
2011-07-22 15:23:57 -07:00
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
4cbc912375
Merge branch 'master' into bulletsim
2011-07-22 09:02:32 -07:00
6426492da0
remove the windows debugging symbols for the long protobuf-net
2011-07-21 03:24:20 +01:00
630e11cbe1
remove dead MXP default symbols. The MXP code is long, long gone.
2011-07-21 03:22:27 +01:00
e1ce106790
make [SMTP] default comment option match actual default
2011-07-21 03:21:19 +01:00
0a09c45726
minor: group all the map tile options together
2011-07-21 03:18:10 +01:00
d2d67a1abf
remove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini
2011-07-21 03:14:43 +01:00
69c2d3434a
minor: remove the pointless quotes from the GenerateMaptiles option
2011-07-21 03:13:54 +01:00
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
2c11f7fc38
Merge branch 'master' into bulletsim
2011-07-20 15:01:32 -07:00
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
b9cbe92f30
Merge branch 'master' into bulletsim
2011-07-11 12:23:20 -07:00
51d6c58d10
Checkin 32 bit bulletsim shared library for Linux.
2011-07-11 12:23:00 -07:00
c920ff9d1d
Merge branch 'master' into careminster-presence-refactor
2011-07-09 01:06:46 +01:00
2fbc98fa5c
Make MeshUploadFlagModule non-shared rather than shared (since each scene needs its own cap)
2011-07-07 23:37:23 +01:00
47cf9c8fe0
Merge branch 'master' into careminster-presence-refactor
2011-07-05 04:01:59 +01:00
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
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
a9b7487fcb
improve and tidy up some config file comments
2011-06-30 22:36:41 +01:00
03feb50a72
minor: adjust some indentation and spacing in OpenSim.ini.example for consistency
2011-06-30 20:26:17 +01:00
5f927dc104
Merge branch 'master' into careminster-presence-refactor
2011-06-30 00:26:03 +01:00
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
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
698cd0b3c2
Remove the now unused [cms] section from OpenSimDefaults.ini
2011-06-25 01:33:09 +01:00
0dd3281caf
Optionally, don't delete previously compiled scripts on startup
2011-06-24 22:07:20 +01:00
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
7974349262
Initial BulletSim.dll commit
2011-06-20 17:28:53 -07:00
6ae73aea49
Merge branch 'master' into careminster-presence-refactor
2011-06-20 03:11:34 +01:00
bbe489e64a
Added missing config var for map image service.
2011-06-15 11:11:14 -07:00
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
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
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
9b1d3f0c38
Merge branch 'master' into careminster-presence-refactor
2011-06-13 12:38:17 +01:00
07d7c1cd2d
Trailing / in MapTileURL must be there!
2011-06-12 18:29:44 -07:00
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
a1c16a4200
Merge branch 'master' into careminster-presence-refactor
2011-06-11 12:08:02 +01:00
39e878eb8f
Align CenomeCache.ini.example values with CenomeCache defaults.
2011-06-11 00:35:31 +01:00
c7cef650db
Make it clear that WaitOnInprogressTimeout is currently a dead setting in FlotsamCache.ini.example
2011-06-11 00:10:40 +01:00
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
c7bdb66a1f
Added missing "Old Guids=true" to ConnectionString
2011-06-10 21:10:37 +01:00
326c46ba70
Merge branch 'master' into careminster-presence-refactor
2011-06-09 02:05:04 +01:00
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
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
4ea89f39f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-03 10:32:21 -07:00
7772640ae8
.ini.example's updated for HG Landmarks
2011-06-03 10:29:59 -07:00
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
b8e2ee6978
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-06-02 21:48:50 +01:00
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
46cdd442a8
[Profiles] --> [Profile]
2011-06-01 18:18:31 -07:00
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
7ea6dfecd9
Adding MSSQL connectionString example
2011-05-30 23:22:52 +01:00
d671dbb7c7
Removing mssql_connection.ini.example - mssql_connection.ini is no longer used
2011-05-30 23:22:49 +01:00
16fae059bb
Comment the alert_uri so it remains disabled until set
2011-05-28 16:40:05 -04:00
3326e417b4
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 16:21:30 -04:00
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
d2c2a4301b
Merge branch 'master' of /home/opensim/src/opensim
2011-05-28 00:39:21 -04:00
99f42c0a6e
Add option to disable logins
...
This just covers script loading for now. More to come.
2011-05-28 00:35:06 -04:00
44d5821c4e
Fixed one comment in a config file.
2011-05-27 13:35:22 -07:00
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
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
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
abae859e7a
Added missing configuration variables to Robust.HG.ini.example
2011-05-26 19:20:29 -07:00
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
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
5c2168cae7
HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing.
2011-05-25 12:32:21 -07:00
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
24f28d3534
HG friends: Status notifications working. Also initial logins get the online friends in other grids.
2011-05-23 19:45:39 -07:00
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
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
f9203ca7e0
Add a message packing library to binary-pack AgentCircuitData for faster
...
teleporting
2011-05-17 22:38:45 +02:00
75d4956ee5
Merge branch 'master' into careminster-presence-refactor
2011-05-13 12:05:46 +01:00
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
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
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
b451cc1ebb
Merge branch 'master' into careminster-presence-refactor
2011-05-08 20:23:06 +01:00
d40e4562f2
Add missing configs for ssl in Robust.HG.ini
2011-05-07 18:54:21 -04:00
7c3e8a106b
Merge branch 'master' of https://github.com/allquixotic/opensim-autobackup
2011-05-06 20:51:55 +01:00
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
4beb0c9b9b
Merge branch 'master' into careminster-presence-refactor
2011-05-05 09:49:10 +01:00
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
fffd42f5cb
Merge git://opensimulator.org/git/opensim
2011-05-02 02:23:18 -04:00
f10666c7ba
How this might look like from a configuration perspective. Changes OpenSimDefaults.ini.
2011-05-01 10:07:54 -07:00
d1cf1fe3d7
Merge branch 'master' into careminster-presence-refactor
2011-04-30 14:37:37 +01:00
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
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
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
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
587aa91e36
Merge git://opensimulator.org/git/opensim
2011-04-26 11:45:38 -04:00
36fef21e52
Merge branch 'master' into queuetest
2011-04-26 08:42:21 -07:00
e579a990b4
Removed stale client components: MXP and VWoHTTP.
2011-04-25 18:59:01 -07:00
a6c53b1ba2
Merge branch 'queuetest' into careminster-presence-refactor
2011-04-25 23:26:37 +01:00
9bf5e94b70
Merge branch 'master' into careminster-presence-refactor
2011-04-25 23:18:32 +01:00
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
0d5a80ad78
Removed unused libraries: RAILS.dll and dependencies.
2011-04-24 19:14:39 -07:00
35c09cae8c
Removed unused libraries Castle.*
2011-04-24 19:06:48 -07:00
d287e0ac68
Merge git://opensimulator.org/git/opensim
2011-04-23 18:33:08 -04:00
082fad6dd2
Fix most issues raised by justincc: http://opensimulator.org/mantis/view.php?id=5440
2011-04-23 18:29:13 -04:00
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
c411ab54ee
Merge branch 'master' into careminster-presence-refactor
2011-04-22 08:55:12 +01:00
b8e282324e
fix merge conflicts with OpenSimDefaults.ini
2011-04-21 19:06:54 -04:00
e0002f6b64
some mesh config asthetics
2011-04-21 19:04:41 -04:00
0c68fbdb1a
Merge branch 'master' into careminster-presence-refactor
2011-04-21 23:06:01 +01:00
5e99d93651
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-04-21 15:16:12 -04:00
d9055c8dc3
Group collada meshies settings under [Mesh] in OpensimDefaults.ini
2011-04-21 15:15:24 -04:00
223c90c751
Remove duplicated freeswitch settings.
2011-04-21 19:31:37 +01:00
09b6d717bf
Merge branch 'master' into careminster-presence-refactor
2011-04-21 16:28:29 +01:00
b786860bac
synchronize Robust.HG.ini.example FreeSWITCH config with other config files
2011-04-19 22:38:43 +01:00
575257f3fe
For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. Thanks for the spot, Ai Austin.
2011-04-19 21:58:55 +01:00
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
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
ccf63a9c63
Merge branch 'master' into careminster-presence-refactor
2011-04-18 21:04:09 +01:00
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
474910c9d6
Merge branch 'master' into careminster-presence-refactor
2011-04-17 18:48:53 +01:00
40bf417da7
Add ColladaMesh switch
2011-04-14 21:15:42 -04:00
424995e138
Move example HttpProxy setting to OpenSim.ini.example and tidy
2011-04-12 23:22:21 +01:00
bed463666c
minor typo correction. thanks Ai Austin.
2011-04-12 23:16:43 +01:00
42b96a8be0
Merge branch 'master' into careminster-presence-refactor
2011-04-12 00:27:39 +01:00
333a2913cf
slightly tweak OpenSim.ini.example text
2011-04-11 22:02:12 +01:00
fda393b088
Add information comment to top of OpenSimDefaults.ini and make file consistent
2011-04-11 21:42:28 +01:00
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
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
738daadace
Merge branch 'master' into careminster-presence-refactor
2011-04-08 04:16:29 +01:00
9ba787be67
Remove old SQLite library
2011-04-08 00:33:33 +01:00
9d40c0dcc7
Remove the SQLite legacy adaptor. This is no longer needed now that the main adaptor works on Mac OS X.
...
The SQLite legacy adapator was also not at all well maintained, even worse than the mainline sqlite adapator.
2011-04-07 23:20:04 +01:00
1b1e6f78fd
Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and use this instead of the system one.
...
This means that Mac OS X users can now use the standard sqlite adaptor instead of the legacy one.
This is SQLite 3.7.5. I configured the build with the line
CFLAGS="-Os -g -isysroot /Developer/SDKs/MacOSX10.6.sdk -arch i386 -arch x86_64 -arch ppc7400 -DSQLITE_ENABLE_COLUMN_METADATA" LDFLAGS="-arch i386 -arch x86_64 -arch ppc7400" ./configure --disable-dependency-tracking
The SQLITE_ENABLE_COLUMN_METADATA flag exports the metadata symbols that modern Mono SQLite adaptors need.
The -Os removes debugging symbols (as per the sqlite3 source pkg README)
The other parts are to cross compile for x86_64, i386 and ppc. On Mac OS X, Mono can actually only P/INVOKE 32-bit libraries even on 64 bit platforms so i386 is being used. The dylib has not been tested on ppc.
2011-04-07 21:44:54 +01:00
329fa73695
Merge branch 'master' into careminster-presence-refactor
2011-04-01 07:44:43 +01:00
2d209d3844
Fix mantis #5413 . WARNING: new config variable in section [GridService] of the simulators called Gatekeeper -- intended to have the URL of the grid's Gatekeeper service (so that it can be checked against). See ini.examples.
2011-03-28 16:46:04 -07:00
dd72a69ea5
More touchup for SQLite.
...
Apply the same change to both the 32-bit and 64-bit DLL target paths. This makes the previous addition to the instructions in the README for running on Linux unnecessary.
2011-03-28 13:13:21 +02:00
fe6900b305
Touchup for SQLite
2011-03-27 19:38:40 -04:00
a62b435a39
Merge branch 'master' into careminster-presence-refactor
2011-03-27 21:41:54 +01:00
9c979dd0fc
Fix a typo in the SQLite DLL config and amend the instructions for running on Linux.
...
Under Linux (and probably also under OSX), the operating system must be able to find the new SQLite DLL in the library search path.
2011-03-23 08:35:39 +01:00
be878795aa
Typo fix
2011-03-22 17:36:01 -04:00
97d46648cd
More SQLite work.
2011-03-22 16:42:12 -04:00
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
Justin Clark-Casey (justincc)