OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,477 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

13477 Commits (2221517935de97a0b564a2da1c6ea2b43125a62f)

Author SHA1 Message Date
Tom Grimshaw e4739523d3 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-03 06:11:46 -07:00
Tom Grimshaw fe2b044d38 Fix Undo! Made a lot of changes to Undo state saving; it now considers that groups of objects can be moved and not just individual prims.. 2010-07-03 06:10:55 -07:00
Tom Grimshaw 39ae1def85 Re-implement the Undo stack as a List; the old implementation was buggy 2010-07-03 06:10:02 -07:00
Tom Grimshaw 2b49cb9227 Make sure the AssetServiceConnector times out within 30 seconds. If it doesn't, the client will get bored and give an upload error, instead of granting success and entering the asset into our retry queue. 2010-07-03 06:09:20 -07:00
Tom Grimshaw 3d495b709e Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds. 2010-07-03 06:08:18 -07:00
Diva Canto 028303c3e1 Fixes mantis #4835 2010-07-03 02:44:28 -07:00
Melanie Thielker 86a82e6ecb Now, fix the slash issue the right way. Our URLs now work like SL's 2010-07-03 08:33:08 +02:00
Melanie Thielker 721d8a7298 Re-add the slashes at the end of the URL. Too much depends on them 2010-07-03 07:09:27 +02:00
Diva Canto 79c1eb1e39 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-02 06:36:08 -07:00
Diva Canto 490f1c144c Fixes mantis #4782 2010-07-02 06:35:38 -07:00
Melanie Thielker 233c872d24 Call client.Start() sunchronously. Calling thos async avoids some stuttering 
when people log in, but fatally screws up money.
 2010-07-02 09:40:58 +02:00
Melanie Thielker e15f6905a5 Clean up IMoneyModule and adjust the other modules to the changes 2010-07-02 06:13:58 +01:00
Melanie Thielker c87e6a289c Clean up IMoneyModule and adjust the other modules to the changes 2010-07-02 06:20:36 +02:00
Melanie Thielker fda9d7b75e Remove GetEconomyData and the economy data structure (unused) 2010-07-02 04:45:03 +01:00
Melanie a4b7863ea1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-07-02 04:21:48 +01:00
dahlia d58b32735d add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784) 2010-07-01 20:50:24 -07:00
Melanie Thielker 9e0b562c6e Fox another scripting nasty. Stuff no system.string objects into lists 2010-07-02 04:21:07 +01:00
Melanie e328c23355 Add MapTileURL to robust to supply the url needed by snowglobe 2010-07-02 04:03:35 +01:00
Melanie Thielker beb5259cd1 Remove GetEconomyData and the economy data structure (unused) 2010-07-02 04:51:31 +02:00
Melanie Thielker a7c4cb95aa Fox another scripting nasty. Stuff no system.string objects into lists 2010-07-02 04:26:55 +02:00
Melanie Thielker 848623eea5 Fix a dumb little sign error that makes a LSL wiki example fail 2010-07-02 03:04:43 +01:00
Melanie Thielker 120c9a4ebb Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-02 03:11:18 +02:00
Melanie ec73074aac Merge branch 'master' into careminster-presence-refactor 2010-07-02 03:02:53 +01:00
Melanie Thielker 60c15d7c28 Fix a dumb little sign error that makes a LSL wiki example fail 2010-07-02 03:05:40 +02:00
Justin Clark-Casey (justincc) 54d7f6ef43 Add region name on the end of script startup debug messages 2010-07-01 21:34:53 +01:00
Justin Clark-Casey (justincc) 12b70ffc7e Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-07-01 21:27:07 +01:00
Tom Grimshaw 68281b356c Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-01 09:47:18 -07:00
Tom Grimshaw 071d601dcb Cache all assets on upload so that the client can still retrieve the asset if it enters a retry queue 2010-07-01 09:46:57 -07:00
Tom Grimshaw b38a22506b Fix build break 2010-07-01 08:57:13 -07:00
Tom Grimshaw 38384cc79c Report asset upload success if it has previously failed 2010-07-01 08:52:30 -07:00
Tom Grimshaw 4851706d35 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-01 08:49:53 -07:00
Tom Grimshaw 1cb7695fb0 Catch newid == null which is what happens if the asset service is offline (seems a connection failure does not throw an exception) 2010-07-01 08:48:02 -07:00
Melanie Thielker 3d5d44279b ANother stab at LSL compatibility 2010-07-01 17:06:29 +02:00
Melanie Thielker 2312504b04 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-01 16:41:03 +02:00
Melanie Thielker d5cbe4cb75 Remove trailing slash from HTTP URLs to be compatible with SL 2010-07-01 16:40:26 +02:00
Melanie Thielker 3940a4dbc7 Avoid a spurious error message when taking a friend's no copy item 2010-07-01 16:11:10 +02:00
Justin Clark-Casey (justincc) 8326f36cda minor: comment out high volume texture serving module debug message 2010-06-30 22:07:28 +01:00
Melanie 46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Melanie dd579cf615 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-30 21:26:43 +01:00
Melanie 1db2921782 Fix scripts in rezzed objects not starting (Mantis #4775) 2010-06-30 21:25:39 +01:00
Justin Clark-Casey (justincc) eb30b60e52 minor: comment out high volume texture serving module debug message 2010-06-30 19:54:35 +01:00
Diva Canto b6264e60d3 Removed opportunity for exception in BaseHttpServer. (mantis #4825) 2010-06-30 06:35:22 -07:00
Tom Grimshaw 9012084d11 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-06-29 23:19:08 -07:00
Tom Grimshaw 8dc7c0849e The other half of the asset fix. Implement an exponentially incrementing retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets. 2010-06-29 23:18:48 -07:00
Justin Clark-Casey (justincc) be0af01061 Revert "stop exceptions in setting and getting state from propogating since they aren't fatal to operations" 
This reverts commit 94cb6fc916.
 2010-06-29 23:43:38 +01:00
Melanie 714367efb9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 21:51:56 +01:00
Diva Canto d06b977ed1 Remove the override from DeletToInventory in HGInventoryAccessModule. This may be causing the infinite loop, not sure. 2010-06-29 14:21:48 -07:00
Melanie 6701fc2ffa Fix the XML serializationt to provide an empty script state element if 
the script hasn't yet saved state, or can't save state because of a loop
 2010-06-29 21:50:52 +01:00
Melanie 5d11833ae1 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-06-29 20:36:36 +01:00
Justin Clark-Casey (justincc) 94cb6fc916 stop exceptions in setting and getting state from propogating since they aren't fatal to operations 
this will hopefully stop "save oar" from failing if a script asset is corrupt
 2010-06-29 21:08:09 +01:00