Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-05 | 2 | -0/+82 |
|\ | |||||
| * | Changed the defaults, so that it behaves exactly is it has been behaving (no ↵ | Diva Canto | 2011-05-02 | 2 | -40/+63 |
| | | | | | | | | WebFetch cap by default). | ||||
| * | How this might look like from a configuration perspective. Changes ↵ | Diva Canto | 2011-05-01 | 1 | -0/+59 |
| | | | | | | | | OpenSimDefaults.ini. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-30 | 55 | -3/+87 |
|\ \ | |/ | |||||
| * | add the executable bit to all bundled DLLs so that these are preserved when ↵ | Justin Clark-Casey (justincc) | 2011-04-27 | 49 | -0/+0 |
| | | | | | | | | | | | | using git or untarring releases under cygwin on windows Mono doesn't care if the | ||||
| * | Thank you Snoopy for a patch that adds some filtering to client versions ↵ | Diva Canto | 2011-04-27 | 3 | -0/+84 |
| | | | | | | | | allowed at login and HG-login times. NOTE: additional (optional) configuration variables in [LoginService] and [GatekeeperService]. See .examples. | ||||
| * | Change default ini.example port used by Freeswitch in grid settings to 8004. | Justin Clark-Casey (justincc) | 2011-04-27 | 3 | -3/+3 |
| | | | | | | | | 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. | ||||
| * | adjust freeswitch grid connector to port 8003 to agree with the default 8003 ↵ | Justin Clark-Casey (justincc) | 2011-04-27 | 2 | -2/+2 |
| | | | | | | | | | | | | used in OpenSim.ini.example Adjusting to 8003 seems sensible since this service doesn't need to be exposed to viewers. | ||||
| * | Merge branch 'master' into queuetest | Mic Bowman | 2011-04-26 | 2 | -0/+0 |
| |\ | |||||
| | * | Removed stale client components: MXP and VWoHTTP. | Diva Canto | 2011-04-25 | 2 | -0/+0 |
| | | | |||||
* | | | Merge branch 'queuetest' into careminster-presence-refactor | Melanie | 2011-04-25 | 1 | -23/+17 |
|\ \ \ | |/ / | |||||
| * | | Cleaned up various configuration options. Removed the category throttle | Mic Bowman | 2011-04-25 | 1 | -23/+17 |
| |/ | | | | | | | | | | | | | | | | | 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). | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-25 | 7 | -0/+1 |
|\ \ | |/ | |||||
| * | Removed unused libraries: RAILS.dll and dependencies. | Diva Canto | 2011-04-24 | 3 | -0/+0 |
| | | |||||
| * | Removed unused libraries Castle.* | Diva Canto | 2011-04-24 | 3 | -0/+0 |
| | | |||||
| * | Added MaxAgents configuration option to RegionConfig.ini allowing region ↵ | E. Allen Soard | 2011-04-23 | 1 | -0/+1 |
| | | | | | | | | hosters to setup regions maintaining more control over system resources. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-22 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | fix merge conflicts with OpenSimDefaults.ini | BlueWall | 2011-04-21 | 4 | -45/+91 |
| |\ | |||||
| * | | some mesh config asthetics | BlueWall | 2011-04-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 2 | -10/+6 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2011-04-21 | 5 | -46/+92 |
| |\ \ | | |/ | |/| | |||||
| | * | Remove duplicated freeswitch settings. | Justin Clark-Casey (justincc) | 2011-04-21 | 1 | -4/+0 |
| | | | |||||
| * | | Group collada meshies settings under [Mesh] in OpensimDefaults.ini | BlueWall | 2011-04-21 | 1 | -6/+6 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-21 | 5 | -49/+101 |
|\ \ \ | | |/ | |/| | |||||
| * | | synchronize Robust.HG.ini.example FreeSWITCH config with other config files | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -10/+32 |
| | | | |||||
| * | | For consistency, uncomment ColladaMesh option in OpenSimDefaults.ini. ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | Thanks for the spot, Ai Austin. | ||||
| * | | Clean up freeswitch config to what is currently required. Add explanation ↵ | Justin Clark-Casey (justincc) | 2011-04-19 | 3 | -35/+63 |
| |/ | | | | | | | to config parameters. Clean up some log messages. | ||||
| * | Move mesh on/off swtich from [Startup] to [Mesh] in anticipation of future ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -4/+6 |
| | | | | | | | | | | | | | | config parameters. Default remains true. OpenSimDefault.ini changed so if you haven't overriden this switch then you don't need to do anything. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-18 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | Provide a configuration setting to control whether multiple taken objects ↵ | Justin Clark-Casey (justincc) | 2011-04-18 | 1 | -0/+7 |
| | | | | | | | | | | | | | | are coalesced to inventory This is the CoalesceMultipleObjectsToInventory setting in [Inventory] in OpenSimDefaults.ini Default is true. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-17 | 2 | -11/+14 |
|\ \ | |/ | |||||
| * | Add ColladaMesh switch | BlueWall | 2011-04-14 | 1 | -1/+5 |
| | | |||||
| * | Move example HttpProxy setting to OpenSim.ini.example and tidy | Justin Clark-Casey (justincc) | 2011-04-12 | 2 | -9/+8 |
| | | |||||
| * | minor typo correction. thanks Ai Austin. | Justin Clark-Casey (justincc) | 2011-04-12 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-12 | 3 | -48/+90 |
|\ \ | |/ | |||||
| * | slightly tweak OpenSim.ini.example text | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -2/+2 |
| | | |||||
| * | Add information comment to top of OpenSimDefaults.ini and make file consistent | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -13/+22 |
| | | |||||
| * | Add more instructions to OpenSim.ini.example to try and make it more ↵ | Justin Clark-Casey (justincc) | 2011-04-11 | 1 | -35/+68 |
| | | | | | | | | understandable for new users. | ||||
| * | Update ODE for mac from source code in opensim-libs SVN library. This ↵ | Justin Clark-Casey (justincc) | 2011-04-08 | 1 | -0/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 6 | -30/+1 |
|\ \ | |/ | |||||
| * | Remove old SQLite library | Justin Clark-Casey (justincc) | 2011-04-08 | 1 | -0/+0 |
| | | |||||
| * | Remove the SQLite legacy adaptor. This is no longer needed now that the ↵ | Justin Clark-Casey (justincc) | 2011-04-07 | 3 | -30/+0 |
| | | | | | | | | | | | | 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. | ||||
| * | Bundle a built-from-source Mac OS X sqlite3 universal dylib with OpenSim and ↵ | Justin Clark-Casey (justincc) | 2011-04-07 | 2 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 3 | -2/+13 |
|\ \ | |/ | |||||
| * | Fix mantis #5413. WARNING: new config variable in section [GridService] of ↵ | Diva Canto | 2011-03-28 | 2 | -0/+11 |
| | | | | | | | | 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. | ||||
| * | More touchup for SQLite. | Marck | 2011-03-28 | 1 | -1/+1 |
| | | | | | | | | 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. | ||||
| * | Touchup for SQLite | BlueWall | 2011-03-27 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-03-27 | 3 | -0/+4 |
|\ \ | |/ | |||||
| * | Fix a typo in the SQLite DLL config and amend the instructions for running ↵ | Marck | 2011-03-23 | 1 | -1/+1 |
| | | | | | | | | | | | | 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. | ||||
| * | Typo fix | BlueWall | 2011-03-22 | 1 | -1/+1 |
| | |