Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Remove the somewhat misleading logging of the string length of some unknown ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 3 | -4/+5 | |
| | | | | | | | | | | | | | | | | | | requests, as this appeared to be some kind of numbered error code. This brings these messages into line with similar messages that did not do this. | |||||
| * | | Implement optional name and description on http stream handlers so that we ↵ | Justin Clark-Casey (justincc) | 2012-05-03 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-04-27 | 1 | -5/+74 | |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs | |||||
| * | | MapImageService: changed the event at which the map tiles are uploaded, ↵ | Diva Canto | 2012-04-27 | 1 | -2/+2 | |
| | | | | | | | | | | | | because they were being uploaded before the region was registered with the grid | |||||
| * | | MapImage security issue. Compare strings instead of IPAddresses. | Diva Canto | 2012-04-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | MapImage security issue: better error messages | Diva Canto | 2012-04-27 | 1 | -3/+5 | |
| | | | ||||||
| * | | Amend to last commit: account for the existence of proxies. | Diva Canto | 2012-04-27 | 1 | -3/+32 | |
| | | | ||||||
| * | | MapImageService: added an additional security check for OSGrid and other ↵ | Diva Canto | 2012-04-27 | 1 | -5/+43 | |
| | | | | | | | | | | | | grids like it. | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-04-25 | 1 | -1/+4 | |
|\ \ \ | |/ / | | / | |/ |/| | Conflicts: OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | |||||
| * | Minor improvements to logging | Oren Hurvitz | 2012-04-24 | 1 | -1/+4 | |
| | | | | | | | | Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]"). | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-04-07 | 1 | -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 Canto | 2012-04-06 | 1 | -13/+59 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-27 | 2 | -2/+2 | |
|\ \ | |/ | ||||||
| * | Send the config section name up to the service classes themselves ↵ | Diva Canto | 2012-03-27 | 2 | -2/+2 | |
| | | | | | | | | (XInventory and Assets). | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -11/+13 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | Comment out login parameters debug output accidentally included with c4b2d24 | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+13 | |
| | | ||||||
* | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 2 | -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-22 | 2 | -1/+12 | |
| | | | | | | | | owned by the same user. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 2 | -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 Canto | 2012-03-21 | 2 | -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 message | Diva Canto | 2012-03-21 | 1 | -1/+0 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 3 | -59/+163 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||||
| * | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 3 | -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 Canto | 2012-03-17 | 1 | -2/+30 | |
| | | | | | | | | direct user connections. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-14 | 1 | -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 Canto | 2012-03-13 | 1 | -7/+12 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-03-08 | 2 | -7/+7 | |
|\ \ | |/ | ||||||
| * | Change "help" to display categories/module list then "help ↵ | Justin Clark-Casey (justincc) | 2012-03-08 | 2 | -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 careminster | Melanie | 2012-03-04 | 1 | -1/+1 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs | |||||
| * | OpenID auth needs hashing before authenticating | BlueWall | 2012-03-02 | 1 | -1/+1 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-02-23 | 1 | -3/+7 | |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| * | Add a position parameter to region crossing of objects. This avoids the | Melanie | 2012-02-23 | 1 | -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 careminster | Melanie | 2012-02-02 | 1 | -1/+1 | |
|\ \ | |/ | ||||||
| * | OpenID: server connector had a copy-and-paste error that made identity ↵ | Diva Canto | 2012-02-02 | 1 | -1/+1 | |
| | | | | | | | | queries fail. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -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-24 | 1 | -4/+3 | |
| | | | | | | | | config sections or files a bit more user friendly. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 2 | -1/+53 | |
|\ \ | |/ | ||||||
| * | Change URI to lowercase to match existing | BlueWall | 2012-01-19 | 1 | -1/+1 | |
| | | ||||||
| * | Add fetching of SRV_HomeURI to "/json_grid_info" | BlueWall | 2012-01-19 | 1 | -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/opensim | BlueWall | 2012-01-17 | 2 | -0/+17 | |
| |\ | ||||||
| | * | Add json handler for GridInfo | BlueWall | 2012-01-17 | 2 | -0/+17 | |
| | | | ||||||
| * | | Allow retrival of multiple user records in one operation, analog to presence | Melanie | 2012-01-16 | 1 | -0/+42 | |
| |/ | ||||||
* | | Add methods to allow the groups modules to query online status and last login | Melanie | 2012-01-16 | 1 | -0/+42 | |
| | | ||||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -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-05 | 1 | -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" command | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -0/+2 | |
| | | ||||||
| * | Rename 'show digest' console command to 'show asset' | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+1 | |
| | | ||||||
| * | Move asset commands from AssetService to AssetServerConnector so that we can ↵ | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -1/+126 | |
| | | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change. | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-05 | 1 | -0/+33 | |
|\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| * | Profile Updates | BlueWall | 2012-01-03 | 1 | -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. |