lotek/opensim
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
33,384 Commits 5 Branches 12,734 Tags
master
Commit Graph

71 Commits

Author SHA1 Message Date
UbitUmarov
fbbcc1edd7 == string.Empty is .Lenght == 0 2022-01-13 20:31:52 +00:00
UbitUmarov
7e0fc95c3a == UUID.Zero is slow 2022-01-09 00:33:16 +00:00
Melanie
b1d7d2a625 Debugging for impersonation 2020-01-31 15:28:40 +00:00
Melanie Thielker
b16abc8166 Massive tab and trailing space cleanup 2017-01-05 19:07:37 +00:00
Melanie Thielker
6749c61d4f Fix the previous commit 2016-11-19 02:28:31 +00:00
UbitUmarov
326821f66e reduce useraccouts cache time 2016-11-11 12:59:43 +00:00
Diva Canto
ab12a14279 Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore. 2016-02-21 11:14:02 -08:00
UbitUmarov
87464b5039 remove a debug message 2015-11-24 02:03:38 +00:00
Diva Canto
59b63b6406 On to 0.8.3! 
Conflicts:
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
 2015-10-18 21:51:49 -07:00
UbitUmarov
371c9dd2af bad merge? 2015-09-01 14:54:35 +01:00
Diva Canto
da32512ea4 Updated all occurrences of AssemblyVersion("0.8.1.*") to AssemblyVersion("0.8.2.*") 2015-04-29 18:47:17 -07:00
Justin Clark-Casey (justincc)
5450b1b024 Change assembly versions to 0.8.1 2014-06-17 18:37:15 +01:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Melanie
d3892bbd06 Merge branch 'master' into careminster 
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
 2013-02-05 21:30:12 +00:00
Justin Clark-Casey (justincc)
1f1da23097 Bump version and assembly version numbers from 0.7.5 to 0.7.6 
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.
 2013-02-05 00:23:17 +00:00
Melanie
e4659a83f1 Merge branch 'master' into careminster 2012-11-17 02:03:24 +00:00
Diva Canto
df62d113ab The last few AssemblyInfos. Finished! 2012-11-14 21:18:18 -08:00
UbitUmarov
db3f0a3748 fix vs2010 build 2012-08-16 15:26:16 +01:00
Melanie
c313de630f Add a real_id field to the login response if impersonation is used. The wrapper 
script needs this for proper logging.
 2012-08-15 23:31:38 +02:00
Melanie
d8f6faa89e Fix impersonation, it got broken in a merge 2012-06-01 23:04:13 +02:00
BlueWall
d242d47e5c OpenID auth needs hashing before authenticating 2012-03-02 15:05:06 -05:00
BlueWall
69c999033b Revert "Fix authentication for OpenID provider" 
This reverts commit 9f597c2d42. Fixing OpenID causes issues with other parts of the code.
 2012-02-29 15:52:15 -05:00
BlueWall
9f597c2d42 Fix authentication for OpenID provider 2012-02-29 14:39:07 -05:00
Melanie
ce5e900721 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
 2012-02-04 11:48:20 +00:00
Justin Clark-Casey (justincc)
8779ff3c8f Supply correct parameters to detailed authentication login fail message 2012-02-04 02:00:35 +00:00
Justin Clark-Casey (justincc)
25c32061e4 Make log messages on authentication failure more explicit 2011-11-11 23:45:08 +00:00
Melanie
a4ec97cfdd Merge branch 'master' into bigmerge 
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
 2011-11-11 23:43:18 +00:00
Melanie
4e9457ca0c Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge 
Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
 2011-10-25 03:26:09 +01:00
Justin Clark-Casey (justincc)
4c9400e646 Add optional getauthinfo and setauthinfo authentication service calls. 
These are disabled by default, as before.  Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
 2011-10-24 21:40:36 +01:00
Tom
66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc)
138a5e04b8 minor: remove mono compiler warning 2011-08-22 23:10:43 +01:00
Melanie
a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
Justin Clark-Casey (justincc)
797128a6ad Rename some member fields to standard m_ OpenSim code convention 2011-03-26 02:44:46 +00:00
Justin Clark-Casey (justincc)
83f48c26d6 add header file 2011-03-26 02:43:41 +00:00
Justin Clark-Casey (justincc)
de0730a54c Add OpenSim.Server.Base reference in prebuild.xml. Initialize svc_checks dictionary in WebkeyOrPasswordAuthenticationService, which was what was causing the load failure. 2011-03-26 02:42:50 +00:00
SignpostMarv Martin
361b3e7ab8 Removing hard-coded plugin loading in favour of direct class instantiation 2011-03-26 02:39:30 +00:00
SignpostMarv Martin
3f4be42a87 Altering log feedback 2011-03-26 02:28:11 +00:00
SignpostMarv Martin
e93531e124 Fixing bug that occurs when using web login- the result was not checked 2011-03-26 02:28:11 +00:00
SignpostMarv Martin
3bc859a834 Making combined auth service re-use the existing auth services instead of duplicating code 
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
 2011-03-26 02:28:11 +00:00
SignpostMarv Martin
0e808950fb InfoFormat > DebugFormat 
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
 2011-03-26 02:28:11 +00:00
SignpostMarv Martin
af3956348f Adding a combined auth service, allowing users to login with either web login or password 
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
 2011-03-26 02:28:11 +00:00
SignpostMarv Martin
482686daab WebkeyAuthenticationService is now no longer a stub! 
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
 2011-03-26 02:28:11 +00:00
Diva Canto
c6f2d66eae Fix bug introduced by Query Access. The response does not come in a packaged _Result field, it comes as simple OSDMap with 2 fields in it. 
Also in this commit: comment out irrelevant debug message on AuthService.
 2011-02-16 09:57:12 -08:00
Melanie
ee9aca9c52 Add the ability for gods to impersonate users. For this, bit 6 needs to be 
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
 2010-11-25 20:34:55 +01:00
Justin Clark-Casey (justincc)
75878c8f43 get TestSaveIarV0_1() working again by setting up an OpenSim.Data.Null.UserAuthenticationData plugin 
additional tweaks to get this working properly
 2010-06-04 20:43:05 +01:00
Diva Canto
c54bc5094d Putting it back to protected; Melanie doesn't like it to be public. 2010-04-27 18:52:15 -07:00
Diva Canto
044c1cf5f6 Changed GetToken from protected to public. This is not exposed at the interface. 2010-04-27 18:37:34 -07:00