aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Address map lag issue seen with non-avination viewersMelanie2012-07-081-1/+14
|
* Merge branch 'master' into careminsterMelanie2012-04-071-13/+59
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Finish the implementation of GetUserInventory, even though it's still not used.Diva Canto2012-04-061-13/+59
| |
* | Merge branch 'master' into careminsterMelanie2012-03-272-2/+2
|\ \ | |/
| * Send the config section name up to the service classes themselves ↵Diva Canto2012-03-272-2/+2
| | | | | | | | (XInventory and Assets).
* | Merge branch 'master' into careminsterMelanie2012-03-231-11/+13
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Comment out login parameters debug output accidentally included with c4b2d24Justin Clark-Casey (justincc)2012-03-221-11/+13
| |
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-222-1/+12
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add llGiveInventory() test from object to object where both objects are ↵Justin Clark-Casey (justincc)2012-03-222-1/+12
| | | | | | | | owned by the same user.
* | Merge branch 'master' into careminsterMelanie2012-03-222-1/+57
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-212-0/+57
| | | | | | | | 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.
| * Removed extraneous debug messageDiva Canto2012-03-211-1/+0
| |
* | Merge branch 'master' into careminsterMelanie2012-03-213-59/+163
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * HG Friends: allow the establishment of HG friendships without requiring ↵Diva Canto2012-03-203-57/+133
| | | | | | | | 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 Canto2012-03-171-2/+30
| | | | | | | | direct user connections.
* | Merge branch 'master' into careminsterMelanie2012-03-141-7/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Minor sanity check on simulation agent handler (content type)Diva Canto2012-03-131-7/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-03-082-7/+7
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-082-7/+7
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge branch 'master' into careminsterMelanie2012-03-041-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
| * OpenID auth needs hashing before authenticatingBlueWall2012-03-021-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-02-231-3/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-231-3/+7
| | | | | | | | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* | Merge branch 'master' into careminsterMelanie2012-02-021-1/+1
|\ \ | |/
| * OpenID: server connector had a copy-and-paste error that made identity ↵Diva Canto2012-02-021-1/+1
| | | | | | | | queries fail.
* | Merge branch 'master' into careminsterMelanie2012-01-251-4/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Make errors reported by OpenSim when it halts because it can't find certain ↵Justin Clark-Casey (justincc)2012-01-241-4/+3
| | | | | | | | config sections or files a bit more user friendly.
* | Merge branch 'master' into careminsterMelanie2012-01-212-1/+53
|\ \ | |/
| * Change URI to lowercase to match existingBlueWall2012-01-191-1/+1
| |
| * Add fetching of SRV_HomeURI to "/json_grid_info"BlueWall2012-01-191-1/+36
| | | | | | | | Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
| * Merge branch 'master' of /home/opensim/lib/osgrid/opensimBlueWall2012-01-172-0/+17
| |\
| | * Add json handler for GridInfoBlueWall2012-01-172-0/+17
| | |
| * | Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-0/+42
| |/
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-0/+42
| |
* | Merge branch 'master' into careminsterMelanie2012-01-061-1/+128
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Make "show asset" command available simulator side. Actually make the ↵Justin Clark-Casey (justincc)2012-01-051-5/+5
| | | | | | | | | | | | service command be "show asset" instead of "show digest" this time. Last time I accidnetally just changed the usage message.
| * Add size and temporary information to "show asset" commandJustin Clark-Casey (justincc)2012-01-051-0/+2
| |
| * Rename 'show digest' console command to 'show asset'Justin Clark-Casey (justincc)2012-01-051-1/+1
| |
| * Move asset commands from AssetService to AssetServerConnector so that we can ↵Justin Clark-Casey (justincc)2012-01-051-1/+126
| | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
* | Merge branch 'master' into careminsterMelanie2012-01-051-0/+33
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Profile UpdatesBlueWall2012-01-031-0/+33
| | | | | | | | Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
* | Merge branch 'master' into careminsterMelanie2012-01-021-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs OpenSim/Services/Interfaces/IUserAccountService.cs
| * Fixed mix-up in UserAccount fields when passing UserAccounts remotely.Diva Canto2011-12-291-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2011-12-181-0/+1
|\ \ | |/
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-0/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-12-0522-29/+29
|\ \ | |/
| * Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead ↵Justin Clark-Casey (justincc)2011-12-0522-29/+29
| | | | | | | | | | | | | | | | of OSHttpRequest/OSHttpResponse. This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation. This is also required to write regression tests that involve the HTTP layer. If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
* | Merge branch 'master' into bigmergeMelanie2011-12-052-2/+34
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * HG: Added HEAD method to Helo service. This is the preferred method, but its ↵Diva Canto2011-12-041-1/+33
| | | | | | | | wide use will have to wait a few releases. So the sims are still calling GET for now.
| * HG: Renamed one methodDiva Canto2011-12-041-1/+1
| |
generated by cgit v1.1 at 2024-11-20 06:37:36 +0000