Commit Graph

13457 Commits (dd2d9a68a7733962d111da5994c673cbd1329a97)

Author SHA1 Message Date
dahlia 815dd73cf3 fix a potential division by zero 2010-07-08 10:01:23 -07:00
Melanie 5f400a50be Merge branch 'master' into careminster-presence-refactor 2010-07-08 17:32:57 +01:00
Melanie baebefeb05 Handle a specific exception without spewing red ink. 2010-07-08 16:30:36 +01:00
Diva Canto 32cfdb0f6a Switched order of conditionals. 2010-07-07 02:40:51 -07:00
Kevin Cozens 07559707c5 Fixes problem where "Adult" regions were reported as being of type "Unknown". 2010-07-07 02:37:22 -07:00
Mike Rieker faaef1b498 minimizes temp garbage for llParseStringKeepNulls()
and uses common routine for llParseStringKeepNulls()/llParseString2List()
2010-07-06 23:59:06 +00:00
Mike Rieker 6e7f1a3ac1 Merge branch 'careminster-presence-refactor' of www.3dhosting.de:/var/git/careminster into careminster-presence-refactor 2010-07-06 02:23:10 +00:00
Mike Rieker 90c5555d6d rewrote hanging llParseStringKeepNulls() 2010-07-06 02:22:47 +00:00
Diva Canto 657056a73f Fixes mantis #4845 2010-07-05 08:48:02 -07:00
Diva Canto cd19e6fe32 Fixes mantis #4842 2010-07-05 07:38:15 -07:00
Diva Canto debc780654 Fixes additional bug reported in mantis #4841. 2010-07-05 07:14:32 -07:00
Tom Grimshaw e947d04038 Undo fix is now complete. This commit repairs the special case of the root prim moving or rotating independently of the rest of the group. 2010-07-05 05:44:35 -07:00
Diva Canto 7525f3a556 Don't include hyperlinks as neighbors, even if grid operators have done the mistake of placing them as neighbors. This will not prevent further mess ups coming from that unsupported action. 2010-07-05 04:19:53 -07:00
Tom Grimshaw be5dd04150 Bring "Redo" up to date with "Undo" so it works too 2010-07-05 03:58:18 -07:00
Diva Canto c7e4880a5e One more buglet fixed related to mantis #4841 -- auto-returns were still chocking on a null pointer exception. 2010-07-05 03:36:26 -07:00
Tom Grimshaw 8849b9af8b Fix single prim rotation undo. All UNDO functions are now working correctly except for when the root prim is moved or rotated as a single prim (coming soon). 2010-07-04 20:45:11 -07:00
Tom Grimshaw c616335019 Rotation undo fix and remove a debug chatter i missed. Still not working: Individual child prim rotational undo and special cases where the root prim was moved or rotated (all the children then need to restore their offsets). Coming shortly. 2010-07-04 19:58:52 -07:00
Tom Grimshaw 5b68343361 The majority of the Undo fix. There is still an issue with Rotation which i'll address next; however position undo and scale undo should be working just fine now. Also removed some residual debug logging. 2010-07-04 19:28:39 -07:00
Tom Grimshaw 7665013ad8 Correct positioning of timeout modifier in the SynchronousRestObjectRequester 2010-07-04 19:25:54 -07:00
Diva Canto b84f72df0b Got rid of all hyperassets references. Also fixed accessing textures in user's inventory in foreign grids. 2010-07-04 14:59:15 -07:00
Diva Canto 02a15bc787 Started to clean up the mess with HyperAssets in LLClientView. Fixed HG access to Notecards in user's inventory. 2010-07-04 13:56:03 -07:00
Tom Grimshaw f3e902092a Add System.Core assembly reference to two projects so that TimeZoneInfo can be used 2010-07-04 12:51:48 -07:00
Tom Grimshaw 14ab22dcd4 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-04 06:51:01 -07:00
Tom Grimshaw 3368e3853a Check cached asset to make sure it contains data, and if not, re-request 2010-07-04 06:45:04 -07:00
Melanie 8a45191aa9 Merge branch 'master' into careminster-presence-refactor 2010-07-04 11:02:21 +01:00
Diva Canto abe0a9ff49 Fixes the obvious problem in mantis #4841. Melanie needs to look at other potential problems there, though. 2010-07-04 02:59:38 -07:00
Melanie Thielker baa20a10c3 Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-07-03 20:29:06 +02:00
Melanie Thielker edcfaf60c9 Fix IMs the right way. This sets it up so that timestamps are actually
in PST (to match viewer time), does correct storage and retrieval of
IMs, corrects the session ID and makes sure IMs don't get marked "saved"
if they're live. Removes the group IM save option, which our group IM
module never had in the first place, as saving group chatter makes no
sense at all.
2010-07-03 20:27:00 +02:00
Diva Canto c117f2144c Compiled Robust.32BitLaunch.exe to .Net 3.5 2010-07-03 10:40:33 -07:00
Tom Grimshaw 4cd5e64231 Use SendTransferAbort in a more sensible place 2010-07-03 09:22:58 -07:00
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