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
214db91503
start storing incoming MediaEntry on a new Media field on PrimitiveBaseShape
...
This allows the media texture to persist in memory - logging in and out will redisplay it (after a click) though navigation will be lost
Next need to implement media uri on prim and delegate more incoming llsd parsing to libomv
2010-07-01 02:06:51 +01:00
9250268753
have a stab at sending the correct number of media entries to shapes
...
actually, this is probably wrong anyway if there's a default texture
it's going to be easier just to gather the object media updates and retain those in-memory now
but what the hell
2010-07-01 00:47:12 +01:00
94646599f0
do a whole load of crappy hacking to get cubes to display google.com
...
currently, for smoe reason the page only appears when you click a face.
also, actually navigating anywhere always snaps you back to the google search box, for some unknown reason
you can still change the url and normal navigation will work again
2010-07-01 00:24:30 +01:00
e098d33929
Register ObjectMedia and ObjectMediaNavigate capabilities from moap module.
...
Not sure if these are correct, but just supplying these to the viewer is enough to allow it to put media textures on prims (previously the icons were greyed out).
This is not yet persisted even in-memory, so no other avatars will see it yet.
2010-06-30 22:30:05 +01:00
8326f36cda
minor: comment out high volume texture serving module debug message
2010-06-30 22:07:28 +01:00
46a531d865
Merge branch 'master' into careminster-presence-refactor
2010-06-30 21:35:05 +01:00
dd579cf615
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-30 21:26:43 +01:00
1db2921782
Fix scripts in rezzed objects not starting (Mantis #4775 )
2010-06-30 21:25:39 +01:00
1077a8a392
add stub media-on-a-prim (shared media) module
2010-06-30 20:46:35 +01:00
eb30b60e52
minor: comment out high volume texture serving module debug message
2010-06-30 19:54:35 +01:00
b6264e60d3
Removed opportunity for exception in BaseHttpServer. (mantis #4825 )
2010-06-30 06:35:22 -07:00
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
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
5925aac859
Add --merge switch to load iar.
...
When this switch is used, iar folders are merged with existing same-name user inventory folders.
This makes it a little easier to back and restore entire individual user inventories, among other things
Added unit test to check behaviour
2010-06-30 00:10:44 +01:00
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
714367efb9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 21:51:56 +01:00
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
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
5d11833ae1
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-06-29 20:36:36 +01:00
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
Melanie Thielker