Commit Graph

15377 Commits (d894007920744979296284e78cb42d504037abc3)

Author SHA1 Message Date
opensim mirror account 4ec0933c99 Merge branch 'master' of /var/git/opensim/ 2010-11-19 18:40:08 -08:00
Justin Clark-Casey (justincc) f49e32bfaa Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-20 02:34:27 +00:00
Justin Clark-Casey (justincc) 2c7be7130e Bump oar version to 1.0 from 0.5
If oar contents are being changed such that older versions of opensim can't load them, then the major version must be increased
This also locks version parameters to either 1.0 or 0.4, so that arbitrary 'versions' cannot be saved
Also closes save stream properly in the event of an error
Version 1.0 OARs are currently incompatible with OpenSim 0.7.0.2 and earlier.  However, you can still save compatible version 0.4 OARs by specifing --version=0 on the save oar command line
e.g. save oar --version=0 oars/test.oar
2010-11-20 02:32:12 +00:00
opensim mirror account 2750e22782 Merge branch 'master' of /var/git/opensim/ 2010-11-18 12:10:08 -08:00
Melanie 164007dd00 Merge branch 'master' into careminster-presence-refactor 2010-11-18 19:06:09 +00:00
Master ScienceSim 8f1a79420b Fixed appearance send for avatars with only default textures. This should fix some of the appearance problems on osgrid. Also added a transaction lock on SetAppearance. This won't prevent concurrent access to Appearance but it will at least make sure each update completes.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-18 19:04:50 +00:00
Melanie f3e4000a55 Send media and other parcel data to client on login. Makes streams visible
right away and starts media.
2010-11-18 13:26:35 +01:00
Melanie 47f0468995 Send parcel data upon becoming root. This will make streams play and build
flags be set properly
2010-11-18 04:18:43 +01:00
Melanie 095e3aae67 Allow llDialog without any buttons and add the automatic OK button as it is
in SL.
2010-11-18 01:11:11 +01:00
opensim mirror account b5160aade0 Merge branch 'master' of /var/git/opensim/ 2010-11-17 16:00:05 -08:00
Justin Clark-Casey (justincc) 859234f963 small refactor: reuse existing commandLine string rather than calling cmdline.ToString() again 2010-11-17 23:50:23 +00:00
opensim mirror account a1bc7f4ba1 Merge branch 'master' of /var/git/opensim/ 2010-11-17 15:40:03 -08:00
Justin Clark-Casey (justincc) c072a9cfb3 save all lines to history, not just those which turn out to be valid comands. does not store passwords
also, blank lines are not stored to history
this makes it easier to go back and correct a command which was simply mistyped rather than having to type it out again
2010-11-17 23:34:39 +00:00
opensim mirror account bfe1f3fdf8 Merge branch 'master' of /var/git/opensim/ 2010-11-17 15:10:07 -08:00
Justin Clark-Casey (justincc) af0deff7e9 Make "show queues [full]" behave like "show users [full]"
Now, "show queues" only shows root agents.  "show queues full" will show child agents as well
2010-11-17 22:55:20 +00:00
Justin Clark-Casey (justincc) c4f3175e17 add "Unacked bytes" column to "show queues"
This should show the number of bytes sent to the client that it has not yet acknowledged.
2010-11-17 22:55:19 +00:00
Justin Clark-Casey (justincc) 2a17c39dfe Fix "show queues" console command
For each agent, this command shows how many packets have been sent/received and how many bytes remain in each of the send queues (resend, land, texture, etc.)
Sometimes useful for diagnostics
2010-11-17 22:55:19 +00:00
Justin Clark-Casey (justincc) e6eeaaea67 minor: add some method comments 2010-11-17 22:55:06 +00:00
opensim mirror account 01c16fc8c8 Merge branch 'master' of /var/git/opensim/ 2010-11-17 11:20:09 -08:00
Melanie 3bc9c1adb4 Merge branch 'master' into careminster-presence-refactor 2010-11-17 18:21:35 +00:00
Melanie 0d72d77629 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-11-17 18:20:41 +00:00
Melanie 43c270b536 Fix gesture and viewer preview sounds not playing 2010-11-17 18:20:24 +00:00
Melanie 2e5ae1b013 Fix gesture and viewer preview sounds not playing 2010-11-17 17:54:32 +01:00
Melanie 80d3998001 Recalculate prim counts when a parcel is deeded 2010-11-17 17:54:03 +01:00
opensim mirror account 36495f6992 Merge branch 'master' of /var/git/opensim/ 2010-11-16 18:00:07 -08:00
Justin Clark-Casey (justincc) 393c9c9046 Add osUnixTimeToTimestamp()
This allows an input unix time to be converted to an llGetTimeStamp() format.
Thanks Thomax.
2010-11-17 01:45:47 +00:00
Justin Clark-Casey (justincc) b38a1594c1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-17 01:28:46 +00:00
opensim mirror account 82786774e4 Merge branch 'master' of /var/git/opensim/ 2010-11-16 15:20:05 -08:00
Melanie 390c3a3b6f Prevent leftover attachments from clogging up the pipes 2010-11-16 22:18:35 +00:00
opensim mirror account 21b7cc5d61 Merge branch 'master' of /var/git/opensim/ 2010-11-16 14:00:07 -08:00
Melanie 0049ec16f5 Prevent leftover attachments from clogging up the pipes 2010-11-16 22:26:07 +01:00
Melanie c4eb430ad2 Merge branch 'master' into careminster-presence-refactor 2010-11-16 21:15:15 +00:00
Melanie 7bb005b0d1 Change the way attachments are persisted. Editing a worn attachment will now
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 21:01:56 +00:00
Melanie d4d45c3acb Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor 2010-11-16 20:47:29 +01:00
Melanie 4f15b8d4e6 Change the way attachments are persisted. Editing a worn attachment will now
save properly, as will the results of a resizer script working. Attachment
positions are no longer saved on each move, but instead are saved once on
logout. Attachment script states are saved as part of the attachment now
when detaching.
2010-11-16 20:44:39 +01:00
Justin Clark-Casey (justincc) c5d78c723b Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-16 19:18:43 +00:00
opensim mirror account 63171839a3 Merge branch 'master' of /var/git/opensim/ 2010-11-16 08:20:04 -08:00
Marck 56bd42b438 Fix osTeleportAgent for hypergrid destinations.
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00:00
opensim mirror account e633b214cb Merge branch 'master' of /var/git/opensim/ 2010-11-16 06:40:10 -08:00
Marck 50202bab7c Add osTeleportOwner.
This provides the same functionality as osTeleportAgent but without the griefing potential. Region owners need not be concerned about the use of this function because it only allows to do what is already possible with the world map.
The intended use is with HUDs. For example, a list of (hypergrid) destinations could be made available for quick access.

Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 13:43:27 +00:00
opensim mirror account fa1f9bb3c1 Merge branch 'master' of /var/git/opensim/ 2010-11-16 03:20:05 -08:00
Melanie e7e3c74fb7 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-11-16 10:22:15 +00:00
Melanie 5329e3b9b7 Can't detach an object from within the script thread because it will throw. Use FireAndForget for that. 2010-11-16 01:36:26 +00:00
Melanie 98ba079e95 Diva needs a spanking! Serializing OldItemID breaks script state persistence in agent inventory. 2010-11-16 01:35:16 +00:00
Melanie c2ac5dc358 Can't detach an object from within the script thread because it will throw.
Use FireAndForget for that.
2010-11-16 01:37:44 +01:00
Melanie 7a9c57a81e When detaching a scripted item, always consider it modified. Script states
will have changed and for real usability, we need to save it. It bloats
assets, but that can't be avoided.
2010-11-16 01:35:45 +01:00
Melanie 0f152bfe8c Diva needs a spanking! Serializing OldItemID breaks script state
persistence in agent inventory.
2010-11-16 01:33:24 +01:00
opensim mirror account c44ab55694 Merge branch 'master' of /var/git/opensim/ 2010-11-12 16:40:03 -08:00
Marck 98f29a47c0 Do not include hyperlinks in a random region search during a login.
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
Marck 2368aab534 Fix: Write asset data into Asset.db when using SQLite 2010-11-13 00:31:02 +00:00