aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/UserAccountService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-231-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * minor: comment out "SetLastPosition" GridUserService debug message for now.Justin Clark-Casey (justincc)2013-11-051-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-09-071-0/+38
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Fix logic errors in "show grid users online" console command which didn't ↵Justin Clark-Casey (justincc)2013-09-031-3/+2
| | | | | | | | | | | | actually filter out users shown continuously online for more than 5 days Remove confusion in command output.
| * Add experimental "show grid users online" console command to show grid users ↵Justin Clark-Casey (justincc)2013-09-031-0/+39
| | | | | | | | | | | | | | | | online from a standalone/robust instance. This is not guaranteed to be accurate since users may be left "online" in certain situations. For example, if a simulator crashes and they never login/logout again. To counter this somewhat, only users continuously online for less than 5 days are shown.
* | Merge branch 'master' into careminsterMelanie2013-07-181-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| * A little more debugDiva Canto2013-07-061-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-07-041-2/+18
|\ \ | |/
| * Deleted debug messages. Fixed a null ref exception on the POST handler of ↵Diva Canto2013-07-021-4/+1
| | | | | | | | GridUserServerPostHandler.cs
| * More debug messagesDiva Canto2013-07-021-1/+5
| |
| * This should have a strong effect on the Unknown User issue mantis #6625Diva Canto2013-07-021-1/+16
| |
* | Merge branch 'master' into careminsterMelanie2013-04-291-1/+1
|\ \ | |/
| * Make method virtualDiva Canto2013-04-271-1/+1
| |
| * Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-261-1/+2
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMaskMelanie2013-03-241-1/+2
| | | | | | | | with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-061-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
| * Changed protection of CreateDefaultAppearanceEntries to protected, so ↵Diva Canto2013-02-051-1/+1
| | | | | | | | extensions of the UserAccountService can reuse this.
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-09-301-12/+1
|\ \ | |/
| * Made a method of GridUserService virtual so it can be overridden.Diva Canto2012-09-301-12/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-09-291-2/+0
|\ \ | |/ | | | | | | | | | | Conflicts: CONTRIBUTORS.txt OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
| * Removed the bits about the TOSModule. That module doesn't go into core. ↵Diva Canto2012-09-271-2/+0
| | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there.
* | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminsterMelanie2012-09-271-0/+2
|\ \ | |/
| * TOS module. WARNING: migration in GridUser table.Diva Canto2012-09-251-0/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix small typoJustin Clark-Casey (justincc)2012-03-201-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-03-081-4/+4
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | <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.
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-161-1/+11
| |
* | Add methods to allow the groups modules to query online status and last loginMelanie2012-01-161-1/+11
| |
* | Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmergeMelanie2011-10-251-3/+11
|\ \ | |/
| * Provide an option to allow remote calls to the CreateUser method on the ↵Justin Clark-Casey (justincc)2011-10-181-3/+11
| | | | | | | | | | | | | | | | | | UserAccountService Default is false, as before. Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces. Only Ruths can be created at present. Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
* | Merge commit '730460169f2a45e934b42b2464f7c7472f7fac48' into bigmergeMelanie2011-10-251-1/+0
|\ \ | |/
| * Bug fix on the bug fix on UserAccountService.csDiva Canto2011-10-161-1/+0
| |
* | Merge commit '83c7b9b609d3c78d099a0bf18de8685676184f94' into bigmergeMelanie2011-10-251-46/+44
|\ \ | |/
| * Bug fix -- Test User on first run standalone might not be created properly: ↵Diva Canto2011-10-131-46/+44
| | | | | | | | let all instances of UserAccountService have all its service references properly initialized, and register console commands on only one.
* | Merge commit 'b907a66f394b279d3ca2b1ac620bc7bb13cc6dd2' into bigmergeMelanie2011-10-121-4/+15
|\ \ | |/
| * When creating a new user on the comand line, give the option of allowing a ↵Justin Clark-Casey (justincc)2011-10-041-4/+15
| | | | | | | | | | | | UUID to be specified to override the randomly generated one. This can be useful in some migration cases where recreating user accounts with known IDs will preserve region scene object ownership.
* | Merge commit '90466515839eb34d7fd9984c92f1970ab5d6f3ad' into bigmergeMelanie2011-10-111-2/+3
|\ \ | |/
| * Pass any region scope through to the CreateUser() methodJustin Clark-Casey (justincc)2011-09-161-2/+3
| |
* | Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmergeMelanie2011-10-111-1/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
| * Correctly create a freshly created estate owner's default items and avatar ↵Justin Clark-Casey (justincc)2011-09-161-1/+3
| | | | | | | | entries on standalone if applicable.
* | Merge commit 'c4efb97d49dec736151dfa3fa102efe6a5f6fbab' into bigmergeMelanie2011-10-111-7/+145
|\ \ | |/
generated by cgit v1.1 at 2024-12-14 22:33:32 +0000