| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge of ubitworkvarnew with opensim/master as of 20150905. | Robert Adams | 2015-09-08 | 1 | -1/+1 |
| |\ | | | | | | | | | | | | | | | This integrates the OpenSim refactoring to make physics, etc into modules. AVN physics hasn't been moved to new location. Does not compile yet. Merge branch 'osmaster' into mbworknew1 | ||||
| | * | More namespace and dll name changes. Still no functional changes. | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | | |||||
| | * | Renamed the namespaces too | Diva Canto | 2015-08-30 | 1 | -1/+1 |
| | | | |||||
| * | | seems to compile ( tests comented out) | UbitUmarov | 2015-09-02 | 1 | -403/+17 |
| | | | |||||
| * | | bad merge? | UbitUmarov | 2015-09-01 | 1 | -125/+562 |
| |\ \ | |/ |/| | |||||
| | * | minor changes | UbitUmarov | 2015-08-31 | 1 | -15/+21 |
| | | | |||||
| | * | stop sending parcel overlays on parcels crossings since SL seems to have | UbitUmarov | 2015-08-28 | 1 | -1/+2 |
| | | | | | | | | | stop sending also | ||||
| | * | try to implement core load oar options | UbitUmarov | 2015-08-24 | 1 | -73/+125 |
| | | | |||||
| | * | varregion: update LandManagementModule and LandObject for variable sized ↵ | Robert Adams | 2015-03-29 | 1 | -29/+34 |
| | | | | | | | | | regions. | ||||
| | * | fix parcel proprieties update sending | UbitUmarov | 2014-10-26 | 1 | -4/+7 |
| | | | |||||
| | * | fix musicURL change being sent back with wrong snap_selection, and not | UbitUmarov | 2014-09-30 | 1 | -22/+20 |
| | | | | | | | | | sent to other avatars. | ||||
| | * | mess update ( hide avatars ) | UbitUmarov | 2014-08-03 | 1 | -8/+12 |
| | | | |||||
| | * | add some filters for NPCs | UbitUmarov | 2014-08-02 | 1 | -0/+4 |
| | | | |||||
| | * | handle change of hide avatars flag. Parcel limits edition still need work | UbitUmarov | 2014-08-01 | 1 | -10/+17 |
| | | | |||||
| | * | remove unnecessary sendparceloverlay | UbitUmarov | 2014-08-01 | 1 | -1/+1 |
| | | | |||||
| | * | MESS: changes in MakeRootAgent and CompleteMovement reordering things. | UbitUmarov | 2014-07-31 | 1 | -4/+22 |
| | | | | | | | | | | | | | Added sending of land overlay and parcel information. This in order to only send avatar related information after having its position well defined and on the right parcel. THIS MAY STILL BE BAD :) | ||||
| | * | changes to parcels code (still more to to) | UbitUmarov | 2014-07-30 | 1 | -55/+82 |
| | | | |||||
| | * | Correct nomenclature for LLSD messages. LL sure suck | Melanie Thielker | 2014-07-29 | 1 | -4/+4 |
| | | | |||||
| | * | Try to plumb the other half | Melanie Thielker | 2014-07-29 | 1 | -0/+13 |
| | | | |||||
| | * | Change some ORs to assignments as they should be | Melanie Thielker | 2014-07-29 | 1 | -5/+5 |
| | | | |||||
| | * | fix the mess about exclusive fields and flags on land overlay | UbitUmarov | 2014-07-29 | 1 | -25/+26 |
| | | | |||||
| | * | change parcel overlay bytes adding LocalSound.. changed others also NEEDS | UbitUmarov | 2014-07-29 | 1 | -20/+31 |
| | | | | | | | | | checking | ||||
| | * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 1 | -48/+179 |
| | |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | | * | Merge branch 'master' into careminster | Melanie | 2013-11-23 | 1 | -47/+129 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat | ||||
| | | * \ | Merge branch 'avination-current' into careminster | Melanie | 2013-06-06 | 1 | -0/+2 |
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | ||||
| | | * \ \ | Merge branch 'master' into careminster | Melanie | 2013-05-12 | 1 | -1/+50 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | | | Differentiate between requests only the owner should be able to do and those | Melanie Thielker | 2014-04-26 | 1 | -6/+6 |
| | | |_|/ / | |/| | | | | | | | | | | | | | that managers can do when setting parcel data | ||||
| | * | | | | Reset "Show in search" on parcels cut off other parcels that are in search | Melanie | 2013-05-24 | 1 | -0/+2 |
| | |/ / / | |||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2013-01-04 | 1 | -21/+75 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-25 | 1 | -2/+0 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs | ||||
| | * \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-11-13 | 1 | -0/+2 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into careminster | Melanie | 2012-10-23 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/LandData.cs | ||||
| | * | | | | | | | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 |
| | | | | | | | | | |||||
| | * | | | | | | | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-06-07 | 1 | -2/+5 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Make timed bans / timed passes work as expected. Prevent transmission of media | Melanie | 2012-06-07 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | URLs to banned clients. | ||||
| | * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-05-05 | 1 | -14/+19 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | * | | | | | | | | | Adapt some TeleportWithMomentum calls | Melanie | 2012-04-25 | 1 | -1/+1 |
| | | |/ / / / / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | | | | | | | Make ban, eject, freeze and the scripted versions of those work. | Melanie | 2012-02-02 | 1 | -3/+3 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Streamline banning code using existing methods. | Melanie | 2012-02-02 | 1 | -183/+29 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Rehook the eject and freeze events that had gotten unhooked in the merge | Melanie | 2012-02-02 | 1 | -0/+2 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge branch 'master' into bigmerge | Melanie | 2011-12-05 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | Merge fixes, and fix the build | Tom | 2011-09-14 | 1 | -0/+2 |
| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 1 | -10/+42 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-05-14 | 1 | -10/+16 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-08 | 1 | -0/+12 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | Add support for the new display name related functions in LSL. This does not | Melanie | 2011-04-08 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | implement the display names functionality as such, but it allows scripts that are display name aware to function as if the display name were implemented and set to the avatar name. | ||||
| | * | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-06 | 1 | -33/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |