aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-231-0/+5
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2012-03-231-0/+5
| | | | | | | | | | | | for now. Default remains false.
* | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-222-0/+17
|\ \ | |/
| * Added new simple_build_permissions config to the .ini and .example files.Diva Canto2012-03-222-0/+17
| |
* | Merge branch 'master' into careminsterMelanie2012-03-222-4/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-222-15/+0
| | | | | | | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9.
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵Diva Canto2012-03-222-0/+15
| | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
| * Fix typoBlueWall2012-03-211-2/+2
| | | | | | | | Add enclosing " to urls
| * HG Friends config for Robust.HG.ini.exampleDiva Canto2012-03-201-2/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-03-211-1/+5
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-207-10/+7
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs
| * | HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-201-1/+5
| | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
* | | Merge branch 'master' into careminsterMelanie2012-03-207-10/+7
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * | Move startup/shutdown command .txt files to .txt.example files to avoid ↵Justin Clark-Casey (justincc)2012-03-194-6/+6
| | | | | | | | | | | | | | | | | | clobbering on updates. Thanks to Whitestar in http://opensimulator.org/mantis/view.php?id=5938 for pointing out this problem.
| * | Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-193-4/+1
| |/ | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | Merge branch 'master' into careminsterMelanie2012-03-1814-116/+41
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * More on HG access control. This commit splits the UserManagementModule into ↵Diva Canto2012-03-172-0/+2
| | | | | | | | the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
| * BAD JUSTIN!Diva Canto2012-03-173-0/+3
| | | | | | | | | | People using standalone in master, please update your StandaloneCommon.ini according to this change. People using robust in master, please update your Robust.HG.ini.example[.HG].ini according to this change.
| * Region access control! Region operators can now specify things like ↵Diva Canto2012-03-176-6/+24
| | | | | | | | DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
| * Terrain: added [Terrain] section with an option to load an initial flat ↵Diva Canto2012-03-162-1/+6
| | | | | | | | terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
| * Move startup_commands.txt.example to startup_commands.txt for consistency ↵Justin Clark-Casey (justincc)2012-03-163-4/+4
| | | | | | | | | | | | with the existing shutdown_commands.txt. Add comments to both files saying what they are (files that can contain console commands to execute on sim startup/shutdown) with an example.
| * Remove unnecessary "backup" command in shutdown_commands.txtJustin Clark-Casey (justincc)2012-03-161-1/+2
| | | | | | | | The simulator is already doing this internally.
| * Remove unused bin/ScriptEngines/Default.lslJustin Clark-Casey (justincc)2012-03-161-104/+0
| | | | | | | | | | It would certainly be nice to change the default script on disk, but this is currently unused and isn't a suitable default. At this location it would also stop an easy manual deletion of script engine compiles and state.
* | Merge branch 'master' into careminsterMelanie2012-03-141-5/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Change OpenSim.ini.example to reflect how to actually enable prim limits,Melanie2012-03-121-5/+1
| | | | | | | | as opposed to how it was first designed.
* | Merge branch 'master' into careminsterMelanie2012-03-111-3/+19
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs
| * Add ability to specify a default estate to be used when creating regions.Justin Clark-Casey (justincc)2012-03-101-3/+19
| | | | | | | | | | | | | | | | This is configured in the new [Estates] section of OpenSim.ini. If a default estate is configured then all new regions are automatically joined to it instead of asking the user. If the default estate does not already exist then it is created. Current default behaviour remains the same - the user is asked for estate details when necessary. Thanks to Frenando Oliveira for the patch which I adapated further.
* | Fix UbitODE dll mappping by simply copying the one from ODE.NetMelanie2012-03-093-6/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-03-042-0/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * Add WebProfiles config to other config exampleBlueWall2012-03-041-0/+3
| |
| * Merge branch 'master' into v3_supportBlueWall2012-03-024-0/+0
| |\
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2522-14/+14
| |\ \
| * | | V3 SupportBlueWall2012-02-221-0/+3
| | | | | | | | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
| * | | Add web profile url setting to iniBlueWall2012-02-211-0/+3
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-034-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | Remove more now unused third party libraries.Justin Clark-Casey (justincc)2012-03-014-0/+0
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2012-02-2522-14/+14
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | Move libopenjpeg native libraries into lib32 and lib64 as appropriate.Justin Clark-Casey (justincc)2012-02-255-5/+5
| | |
| * | Remove some more unused Bullet libraries.Justin Clark-Casey (justincc)2012-02-253-0/+0
| | |
| * | Remove old libbulletnet native libraries. These are not used in the current ↵Justin Clark-Casey (justincc)2012-02-252-0/+0
| | | | | | | | | | | | generation bullet physics plugin.
| * | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵Justin Clark-Casey (justincc)2012-02-259-9/+9
| | | | | | | | | | | | appropriate.
| * | Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like ↵Justin Clark-Casey (justincc)2012-02-253-0/+0
| |/ | | | | | | these were once connected with HttpServer.dll but are now unused.
* | Merge branch 'master' into careminsterMelanie2012-02-216-0/+0
|\ \ | |/ | | | | Conflicts:
| * Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | | | | | bit one in lib64
| * Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-212-0/+0
| | | | | | | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.
| * Replace previous windows 64-bit sqlite3.dll with one from ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | | | | | | | | | | | | | | | http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not. This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference. This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
| * Replace win 64-bit sqlite3.dll with another version, though I suspect this ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | | | | | one won't work either.
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-212-0/+0
| |
| * Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-212-0/+0
| | | | | | | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
* | Merge branch 'ubitwork'Melanie2012-02-193-0/+7
|\ \ | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
generated by cgit v1.1 at 2024-12-18 03:40:04 +0000