aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-071-0/+0
|\
| * remove default values from prior commit since mono cant deal with themdahlia2012-05-071-0/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-05-053-0/+45
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Calculate the Daylight Savings Time information sent to the viewer based on ↵Justin Clark-Casey (justincc)2012-05-043-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | US Pacific Standard Time rather than whatever timezone the login server is set to. This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time. However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation. This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST. If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local". A mailing list announcement will be made later. Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch. From http://opensimulator.org/mantis/view.php?id=5972
* | Merge branch 'master' into careminsterMelanie2012-04-305-165/+0
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLAssetData.cs OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/MySQLUserAccountData.cs
| * Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on ↵Justin Clark-Casey (justincc)2012-04-3011-363/+0
| | | | | | | | | | | | and off within tests. This makes *.Tests.dll.config files no longer needed, hence deleted.
* | Merge branch 'master' into careminsterMelanie2012-04-273-0/+15
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * Use DotNetZip to compress OARs and IARs.Oren Hurvitz2012-04-271-0/+0
| | | | | | | | DotNetZip provides much better compression than standard .NET.
| * Amend to last commit: account for the existence of proxies.Diva Canto2012-04-272-0/+7
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-04-271-0/+7
| |\
| * | MapImageService: added an additional security check for OSGrid and other ↵Diva Canto2012-04-272-0/+8
| | | | | | | | | | | | grids like it.
* | | Merge branch 'master' into careminsterMelanie2012-04-271-0/+7
|\ \ \ | | |/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | Add a configuration switch to turn on/off the use of the trashMic Bowman2012-04-251-0/+7
| |/ | | | | | | | | | | | | | | | | folder when deleting objects from a scene. The use of the trash folder causes assets to be created and stored everytime you delete an object from the scene (slows down the delete and adds mostly useless assets to your database). Default is on (use the trash folder) which is the standard behavior.
* | Merge branch 'master' into careminsterMelanie2012-04-181-0/+6
|\ \ | |/
| * add configuration for jsonstore module, disabled by defaultMic Bowman2012-04-171-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-04-131-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * make changes to FlotsamCache.ini.example as noted in mantis #5960nebadon2012-04-121-2/+2
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5960
* | Merge branch 'master' into careminsterMelanie2012-04-114-13/+21
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Interfaces/IEstateModule.cs
| * HGFriendsModule: Added optional user level based restriction to send ↵Snoopy Pfeffer2012-04-112-0/+8
| | | | | | | | friendship invitations to foreign users.
| * minor: convert tabs to spaces in config example files from recent 7c534e5Justin Clark-Casey (justincc)2012-04-102-12/+12
| |
| * Correct max_listeners_per_region in OpenSimDefaults.ini to ↵Justin Clark-Casey (justincc)2012-04-101-1/+1
| | | | | | | | | | | | | | max_listens_per_region Value for this setting in OpenSimDefaults.ini (1000) is same as setting in code (1000) so this should have no effect Thanks to Ovi Chris Rouly for pointing this out.
* | Merge branch 'master' into careminsterMelanie2012-04-082-0/+16
|\ \ | |/
| * Added gatekeeper and uas addresses to grid info, so that viewers can take ↵Diva Canto2012-04-072-0/+16
| | | | | | | | advantage of that info.
* | Merge branch 'master' into careminsterMelanie2012-03-297-4/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * BulletSim: update 64 bit libraries and change Linux configuration to use the ↵Robert Adams2012-03-287-4/+4
| | | | | | | | files in the lib32 and lib64 directories as needed.
* | Merge branch 'master' into careminsterMelanie2012-03-273-0/+22
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * User level based restrictions for HyperGrid teleports, asset uploads, group ↵Snoopy Pfeffer2012-03-273-0/+22
| | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
* | Merge branch 'master' into careminsterMelanie2012-03-275-1/+2
|\ \ | |/
| * BulletSim: update BulletSim binaries and configuration fixing a crash which ↵Robert Adams2012-03-265-1/+2
| | | | | | | | happens when there are more than a few hundred physical objects.
* | Merge branch 'master' into careminsterMelanie2012-03-265-1/+11
|\ \ | |/
| * BulletSim: update BulletSim.dll and libBulletSim.so with latest versionsRobert Adams2012-03-264-0/+0
| |
| * BulletSim: change default of shouldDisableContactPoolDynamicAllocation from ↵Robert Adams2012-03-231-1/+1
| | | | | | | | False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
| * BulletSim: add a bunch of internal Bullet configuration parameters to ↵Robert Adams2012-03-231-0/+9
| | | | | | | | OpenSimDefaults.ini and the code.
| * BulletSim: add updated (but not working) BulletSim dllsRobert Adams2012-03-234-0/+0
| |
| * BulletSim: Add AvatarRestitution parameter. Centralize computation of ↵Robert Adams2012-03-231-1/+2
| | | | | | | | buoyancy for flying. Tweek avatar default friction and resititution
| * BulletSim: add some new runtime setable parameters to match the dll.Robert Adams2012-03-231-1/+1
| |
| * BulletSim: update BulletSim.dll to Bullet 2.80 and add libBulletSim.so to ↵Robert Adams2012-03-234-0/+0
| | | | | | | | the new lib32 and lib64 binary directories
* | 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
generated by cgit v1.1 at 2024-12-18 18:14:46 +0000