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
3368e3853a
Check cached asset to make sure it contains data, and if not, re-request
2010-07-04 06:45:04 -07:00
8a45191aa9
Merge branch 'master' into careminster-presence-refactor
2010-07-04 11:02:21 +01:00
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
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
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
c117f2144c
Compiled Robust.32BitLaunch.exe to .Net 3.5
2010-07-03 10:40:33 -07:00
4cd5e64231
Use SendTransferAbort in a more sensible place
2010-07-03 09:22:58 -07:00
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
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
39ae1def85
Re-implement the Undo stack as a List; the old implementation was buggy
2010-07-03 06:10:02 -07:00
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
3d495b709e
Implement a timeout value in the SynchronousRestObjectRequester. Default is 100 seconds.
2010-07-03 06:08:18 -07:00
028303c3e1
Fixes mantis #4835
2010-07-03 02:44:28 -07:00
86a82e6ecb
Now, fix the slash issue the right way. Our URLs now work like SL's
2010-07-03 08:33:08 +02:00
721d8a7298
Re-add the slashes at the end of the URL. Too much depends on them
2010-07-03 07:09:27 +02:00
79c1eb1e39
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-02 06:36:08 -07:00
490f1c144c
Fixes mantis #4782
2010-07-02 06:35:38 -07:00
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
e15f6905a5
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:13:58 +01:00
c87e6a289c
Clean up IMoneyModule and adjust the other modules to the changes
2010-07-02 06:20:36 +02:00
fda9d7b75e
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:45:03 +01:00
a4b7863ea1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-07-02 04:21:48 +01:00
d58b32735d
add Micheil Merlin to CONTRIBUTORS.txt (Mantis #4784 )
2010-07-01 20:50:24 -07:00
9e0b562c6e
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:21:07 +01:00
e328c23355
Add MapTileURL to robust to supply the url needed by snowglobe
2010-07-02 04:03:35 +01:00
beb5259cd1
Remove GetEconomyData and the economy data structure (unused)
2010-07-02 04:51:31 +02:00
a7c4cb95aa
Fox another scripting nasty. Stuff no system.string objects into lists
2010-07-02 04:26:55 +02:00
848623eea5
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:04:43 +01:00
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
ec73074aac
Merge branch 'master' into careminster-presence-refactor
2010-07-02 03:02:53 +01:00
60c15d7c28
Fix a dumb little sign error that makes a LSL wiki example fail
2010-07-02 03:05:40 +02:00
53ddcf6d25
Implement media texture persistence over server restarts for sqlite
...
This is currently persisting media as an OSDArray serialized to LLSD XML.
2010-07-01 22:52:31 +01:00
54d7f6ef43
Add region name on the end of script startup debug messages
2010-07-01 21:34:53 +01:00
12b70ffc7e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-07-01 21:27:07 +01:00
ca5d1411a6
handle ObjectMediaNavigateMessage
...
Other avatars can now see the webpages that you're navigating to.
The requirement for an initial prim click before the texture displayed has gone away.
Flash (e.g. YouTube) appears to work fine.
Still not persisting any media data so this all disappears on server restart
2010-07-01 20:25:35 +01:00
4fb7c1a9e1
send a full object update out to avatars when a media texture is initially set
...
this allows other avatars to see it, but still only after they've clicked on the face
still not handling navigation yet
2010-07-01 19:53:03 +01:00
81f727416d
start sending media url in object full updates
2010-07-01 19:33:41 +01:00
18b22e26cb
start storing a mediaurl on the scene object part
...
not yet persisted or sent in the update
2010-07-01 19:25:46 +01:00
de769d56f5
replace hand parsing of incoming object media messages with parsing code in libopenmetaverse
2010-07-01 18:42:47 +01:00
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
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
b38a22506b
Fix build break
2010-07-01 08:57:13 -07:00
38384cc79c
Report asset upload success if it has previously failed
2010-07-01 08:52:30 -07:00
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
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
3d5d44279b
ANother stab at LSL compatibility
2010-07-01 17:06:29 +02:00
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
d5cbe4cb75
Remove trailing slash from HTTP URLs to be compatible with SL
2010-07-01 16:40:26 +02:00
3940a4dbc7
Avoid a spurious error message when taking a friend's no copy item
2010-07-01 16:11:10 +02:00
Tom Grimshaw