| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster | Melanie | 2012-03-28 | 3 | -12/+149 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-27 | 2 | -2/+105 |
| | |\ | |||||
| | | * | Add "friends show cache <first-name> <last-name>" command for debugging ↵ | Justin Clark-Casey (justincc) | 2012-03-28 | 2 | -2/+105 |
| | | | | | | | | | | | | | | | | | | | purposes. This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly. | ||||
| | * | | HG: Switch root folders from under the viewer. Towards HG 2.0. This is ↵ | Diva Canto | 2012-03-27 | 1 | -10/+44 |
| | |/ | | | | | | | guarded by an obscure config that no one but me should be using at this point. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 3 | -2/+37 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Let grided simulators retrieve the user's inventory skeleton | Diva Canto | 2012-03-27 | 1 | -1/+1 |
| | | | |||||
| | * | User level based restrictions for HyperGrid teleports, asset uploads, group ↵ | Snoopy Pfeffer | 2012-03-27 | 2 | -1/+36 |
| | | | | | | | | | creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -3/+29 |
| |\ \ | |/ | |||||
| | * | HG: beginning of a more restrictive inventory access procedure (optional). ↵ | Diva Canto | 2012-03-27 | 2 | -3/+29 |
| | | | | | | | | | Experimental: we'll try switching the root folder from under the viewer. | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 1 | -2/+0 |
| |\ \ | |/ | |||||
| | * | In TerrainModule.cs, the command terrain save-tile is modified to remove an ↵ | Garmin Kawaguichi | 2012-03-27 | 1 | -2/+0 |
| | | | | | | | | | unnecessary double argument "minimum Y tile" | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-25 | 3 | -33/+61 |
| |\ \ | |/ | |||||
| | * | Hack example on to "terrain save-tile" extended help. | Justin Clark-Casey (justincc) | 2012-03-24 | 1 | -0/+6 |
| | | | | | | | | | Thanks to Garmin Kawaguichi for the initially suggested text. | ||||
| | * | Use system provided temporary file in "terrain save-tile" to avoid problems ↵ | Justin Clark-Casey (justincc) | 2012-03-24 | 1 | -3/+3 |
| | | | | | | | | | | | | | with drive letters on windows Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted). | ||||
| | * | Give feedback when "terrain save-tile" is not successfully invoked. | Justin Clark-Casey (justincc) | 2012-03-24 | 2 | -30/+52 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -6/+6 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Comment out a terrain save-tile debugging message that accidentally crept in ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -6/+6 |
| | | | | | | | | | with c4b2d24 | ||||
| * | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 1 | -0/+6 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -7/+10 |
| | |\ | |||||
| | * | | Add llGiveInventory() test from object to object where both objects are ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -0/+6 |
| | | | | | | | | | | | | | owned by the same user. | ||||
| * | | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster | Melanie | 2012-03-22 | 1 | -7/+10 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | HG Friends: don't notify if the server isn't there. | Diva Canto | 2012-03-22 | 1 | -7/+10 |
| | |/ | |||||
| | * | Change a false false to be truly true - or is this statement false? | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | | | | | | | Fixes perms boo-boo | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 6 | -60/+139 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Rework Diva's patch to simplify it | Melanie | 2012-03-22 | 2 | -16/+29 |
| | | | |||||
| | * | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵ | Melanie | 2012-03-22 | 2 | -69/+6 |
| | | | | | | | | | | | | | 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 Canto | 2012-03-22 | 2 | -6/+69 |
| | | | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. | ||||
| | * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 2 | -7/+26 |
| | | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
| | * | HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that ↵ | Diva Canto | 2012-03-21 | 3 | -20/+58 |
| | | | | | | | | | we can better manage this traffic. | ||||
| | * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -3/+0 |
| | | | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -1/+7 |
| | |\ | |||||
| | | * | Replace "scene debug true false true" console command with "scene debug ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings. | ||||
| | * | | Removed extraneous debug messages. Added a check for UUID.Zero. | Diva Canto | 2012-03-20 | 1 | -16/+23 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 6 | -167/+303 |
| |\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | |\ | |||||
| | * | | Fixed borkness with map search introduce by my last changes to it. | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -18/+7 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 2 | -9/+2 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs | ||||
| | * | | | | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 5 | -167/+276 |
| | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 2 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | direct user connections. | ||||
| * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -1/+1 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | fix compile error from last commit | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -18/+7 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest() | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -18/+7 |
| | | |/ | |/| | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -2/+0 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+0 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -7/+2 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs | ||||
| | * | | Fix a bug where logins to standalones would fail if the RegionReady module ↵ | Justin Clark-Casey (justincc) | 2012-03-19 | 1 | -7/+2 |
| | |/ | | | | | | | | | | | | | was not active Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active. However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded | ||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-18 | 10 | -145/+482 |
| |\ \ | |/ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | Amend to previous commit: normalize strings ToLower. | Diva Canto | 2012-03-17 | 1 | -2/+6 |
| | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |