Justin Clark-Casey (justincc)
387f743993
If we're saving an IAR with --profile information, then label this a version 1.0 IAR since it isn't compatible with older OpenSim releases.
2010-12-11 02:18:16 +00:00
Justin Clark-Casey (justincc)
373ef594ba
Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.
...
Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this.
2010-12-11 01:57:32 +00:00
Marck
b512ecd1dc
Normalization of OSSL function names.
...
Added the following replacement functions for compliance to the OSSL standards stated on the wiki:
osGetTerrainHeight
osSetTerrainHeight
osGetSunParam
osSetSunParam
osSetPenColor
The functions that do not comply to the standard give a warning when used but work normally otherwise.
The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour".
The following two functions have been renamed because they are not enabled yet aynway:
osWindParamSet => osSetWindParam
osWindParamGet => osGetWindParam
2010-12-10 22:20:35 +01:00
Diva Canto
d8fd917076
Revert "A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues."
...
This reverts commit f84905e294
.
2010-12-10 12:40:12 -08:00
Diva Canto
58b251506c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-10 11:33:09 -08:00
Diva Canto
f84905e294
A stab at mantis #5256 . Separate ScenePresence updates from SceneObject updates, and place them in different queues.
2010-12-10 11:32:46 -08:00
Marck
6f37290f4c
Adjust hypergrid console commands to latest changes.
2010-12-10 17:48:45 +01:00
Justin Clark-Casey (justincc)
a918c8df97
fix the minimap sitting avatar location bug
...
a sitting avatar should have it's offset position added to the scene object, not its absolute position
2010-12-10 03:46:16 +00:00
Justin Clark-Casey (justincc)
3053f5ba7d
minor: remove some compiler warnings
2010-12-10 03:08:31 +00:00
Diva Canto
cefdee8aaf
Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259
2010-12-09 16:52:37 -08:00
Diva Canto
baa8ddfd26
Minor bug fixes. Hunting down mantis #5259
2010-12-09 08:28:21 -08:00
Diva Canto
ab980fc927
Fixed wrong comment
2010-12-08 19:47:05 -08:00
Diva Canto
90bcfefe09
Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase yet...
2010-12-08 19:37:35 -08:00
Melanie
7fef89847c
Merge branch 'master' into careminster-presence-refactor
2010-12-09 02:24:12 +00:00
Melanie
d7346dd5ff
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-09 01:55:45 +00:00
Diva Canto
1070cffcf9
Added ability for GetTexture to serve multiple formats. The format may come as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
2010-12-08 18:53:15 -08:00
Melanie
4df1d25d23
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
Melanie
f28dc77ab4
Plumb a code path for the entity transfer module to ask a destination scene
...
whether or not an agent is allowed there as a root agent.
2010-12-09 02:01:41 +01:00
Diva Canto
796216e44f
Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs)
2010-12-07 20:05:53 -08:00
Diva Canto
7cfb3d7e96
Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up.
2010-12-07 17:17:06 -08:00
Justin Clark-Casey (justincc)
1fa9399ab8
change doc. trivial commit to get panda to rebuild
2010-12-08 00:41:33 +00:00
Melanie
80b84e4bad
Prevent sending of attachment data to any client if the attachment
...
is not actually attached to any avatar. Another stab ad fixing "HUD hair"
2010-12-08 00:08:14 +01:00
Melanie
b9f54fca5d
Allow TPing multiple people in the friends list in one go.
2010-12-07 23:01:42 +01:00
Melanie
549f90c5b5
Update calling card interface
2010-12-07 04:45:28 +01:00
Melanie
a4f7937eb3
Add the interface needed to revive calling cards
2010-12-07 03:08:48 +01:00
Melanie
b325721d6f
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-07 01:07:57 +01:00
Melanie
b960a05e67
Cowardly refuse to keep running when no application plugins are loaded.
...
Prevents empty instances from hanging around when Mono.Addins messes up
2010-12-07 01:07:13 +01:00
Melanie
b1a5c03985
Lock the attachments dict so it doesn't get out of sync when iterating
2010-12-06 17:40:07 +01:00
Diva Canto
72748746d5
Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB.
2010-12-05 19:43:24 -08:00
Melanie
45314c6622
Merge branch 'master' into careminster-presence-refactor
2010-12-06 02:54:51 +00:00
Jonathan Freedman
45cd2e3ef9
Merge branch 'master-core' into mantis5110
2010-12-05 11:49:15 -08:00
sacha
835103af82
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 21:50:48 +00:00
sacha
9b9ce8fb27
add more detail to the log in case of FORM Timeout
...
cause nothing relevant are in the services logs
2010-12-04 21:40:18 +00:00
Melanie
4b979362e9
Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims
...
Removed some unneccessarily wordy core comments
2010-12-04 14:41:57 +01:00
Melanie
96446adfa4
Monitor the UUIDs used to create and update wearable assets. Reject any changed
...
texture that is not present in the user's inventory full perm.
This will prevent "UUID snatching", a copybot-type of attack that can cause
clothing makers to be forced to destroy and replace legit items in order to
invalidate the copies.
2010-12-04 07:06:30 +01:00
Melanie
4ca108f85e
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 04:50:24 +00:00
Melanie
89fec4ff5b
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-12-04 04:25:08 +00:00
Melanie
ea17b262a3
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:24:55 +00:00
Melanie
f41dfbabc8
Simplify updating of agent inventory assets. Make newly created asset IDs
...
random rather than using IDs known by the client ahead of time.
2010-12-04 05:01:44 +01:00
Melanie
349767f8a2
Merge branch 'master' into careminster-presence-refactor
2010-12-04 04:25:39 +00:00
Melanie
bab6b6cd87
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-04 04:36:44 +01:00
Melanie
da91a2ab7e
Convert the agent asset transactions module to a new style module.
...
Refactor to remove the property "MyScene" and the pointless circular
refs to the managing classes. Converted the module to a non-shared module.
Reformatted source for 80 columns. Removed the special role the module
had in the old loader.
2010-12-04 04:33:14 +01:00
Justin Clark-Casey (justincc)
7b6b4501b7
minor: add class doc line to older region module example code pointing towards newer
2010-12-04 02:49:41 +00:00
Justin Clark-Casey (justincc)
f268cd7c53
comment out the extension attribute
2010-12-04 02:47:29 +00:00
Justin Clark-Casey (justincc)
57b5263ecf
add bare bones shared example module
2010-12-04 02:46:59 +00:00
Justin Clark-Casey (justincc)
510b55c7f0
refactor some common code in RegionModulesControllerPlugin
...
also some minor doc changes in BareBonesNonSharedModule
2010-12-04 02:38:26 +00:00
Justin Clark-Casey (justincc)
c010491d34
correct the id of the example module
2010-12-04 01:38:32 +00:00
Justin Clark-Casey (justincc)
a06032d96e
Add the most bare bones non-shared region module example. Not active unless the correct line is uncommented.
2010-12-04 01:36:35 +00:00
Justin Clark-Casey (justincc)
0ab774d484
add warning decals and information to RegionModule.cs in probably non-functional OpenSim.Region.Examples.SimpleModule project
2010-12-04 01:06:29 +00:00
Justin Clark-Casey (justincc)
9668fb4e31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-12-04 00:57:18 +00:00
Justin Clark-Casey (justincc)
2486d96d06
minor: correction to logging category
2010-12-04 00:56:53 +00:00
Melanie
24af7b8384
Merge branch 'master' into careminster-presence-refactor
2010-12-04 00:09:32 +00:00
Justin Clark-Casey (justincc)
b69c5d6633
minor: change OpenSimBase log messages associated with newer module loader to make the association clear
2010-12-03 23:50:09 +00:00
Mic Bowman
df860516bf
Various bug fixes for appearance handling: more aggressive reset of textures and vparams when appearance is not cached and when wearables change. Send appearance to the viewer with initial data.
...
Cleaned up (and added) debugging.
2010-12-03 23:45:00 +00:00
Melanie
8e3bacc691
When linking something, immediately persist the linked set.
2010-12-03 23:06:44 +01:00
Kitto Flora
bf695cccba
Fix spurious Av move when clothing item worn or removed.
2010-12-03 18:32:58 +00:00
Melanie
60b055de4c
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-12-03 19:04:59 +01:00
Melanie
4407c4700f
Fix status responses in remote admin
2010-12-03 19:02:42 +01:00
Melanie
8741676bc3
Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""
...
This reverts commit 6c01ebb875
.
2010-12-03 18:32:03 +01:00
Melanie
b940925173
Improve health reporting
2010-12-03 07:27:29 +01:00
Melanie
e913e1690e
Fix health reporting. This will now actually monitor the threads properly
...
and not just the http server. It will also restart a dead heartbeat.
2010-12-03 07:16:06 +01:00
Melanie
ce1aedf474
Add a missing interface memeber to the new HG stuff
2010-12-03 07:04:07 +01:00
Melanie
6c01ebb875
Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region."
...
This reverts commit 2827deffe8
.
Pulling out a bad core commit that broke attachment teleporting for us
2010-12-03 04:39:51 +01:00
Melanie
342dc532ec
Merge branch 'master' into careminster-presence-refactor
...
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00:00
Melanie
ec01936d38
Change the way sim health reporting reports sim startup
2010-12-03 02:37:08 +01:00
Justin Clark-Casey (justincc)
7e72afcb3e
Only force prim persistence before delete if the prim is the result of an unpersisted delink
...
This considerably improves delete performance for objects with large linksets
2010-12-03 00:12:59 +00:00
Justin Clark-Casey (justincc)
5246d98b8d
Stop LLUDPServer sending updates after object deletes by always queueing deletes
...
If an LL 1.23.5 client (and possibly earlier and later) receives an object update after a kill object packet, it leaves the deleted prim in the scene until client relog
This is possible in LLUDPServer if an object update packet is queued but a kill packet sent immediately.
Beyond invasive tracking of kill sending, most expedient solution is to always queue kills, so that they always arrive after updates.
In tests, this doesn't appear to affect performance.
There is probably still an issue present where an update packet might not be acked and then resent after the kill packet.
2010-12-02 02:01:01 +00:00
Justin Clark-Casey (justincc)
26569a7cd0
minor: add some method doc
2010-12-02 02:01:01 +00:00
Diva Canto
7d24dbca3c
Added some comments. Better than listening to the boring speaker...
2010-12-01 16:01:22 -08:00
Mic Bowman
ab2adaf341
Various bug fixes for appearance handling
2010-11-30 16:20:43 +01:00
Melanie
0218845c2e
Prevent the restart module from barfing if it's not configured
2010-11-30 15:40:50 +01:00
Melanie
b08cc63003
Change inworld restart to use blue boxes rather than notices to match SL
2010-11-29 21:45:03 +01:00
Diva Canto
f3835fe15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-29 09:58:20 -08:00
Diva Canto
49b59fffee
Fix unit test.
2010-11-29 09:57:41 -08:00
Diva Canto
f86c438653
Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
2010-11-29 08:43:33 -08:00
Melanie
04ce7de5ed
Fix the build break
2010-11-29 01:15:30 +00:00
Melanie
836b73f765
Fix the build break
2010-11-29 01:15:02 +00:00
Melanie
0acfe80f21
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:37:21 +00:00
Marck
4d104cf6fe
Make gatekeeper's address check case-insensitive.
2010-11-28 23:35:38 +00:00
Melanie
5aeb83125a
Remove the most spammy XML dumps from the FS voice module
2010-11-28 23:30:55 +00:00
Melanie
2bee150aac
Implement health monitoring of the packet receiving and sending threads
2010-11-28 20:45:03 +01:00
Melanie
0f1fc79994
Implement god summons
2010-11-28 20:14:58 +01:00
Diva Canto
ca8d015733
Changed the parser for InventoryItem deserialization. Moved some utility functions around.
2010-11-27 11:40:54 -08:00
Melanie
4765fd9cd0
Remove hard limit on prim owners. The new LibOMV autosplits packets to
...
prevent overflow
2010-11-27 19:31:18 +01:00
Melanie
2412b3cb4a
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-27 13:07:23 +01:00
Melanie
0b41606e73
Instrument TI Dictionary to finally find that pesky script-caused deadlock
2010-11-27 13:02:51 +01:00
Marck
d71d4f96e3
Amend GetLinkPrimitiveParams with implementations for PRIM_TEXGEN, PRIM_BUMP_SHINY, PRIM_FULLBRIGHT, and PRIM_GLOW
2010-11-27 10:59:14 +01:00
Marck
947d730b56
Make gatekeeper's address check case-insensitive.
2010-11-27 09:18:39 +01:00
Diva Canto
3292a22558
Creator information preserved upon HG transfers.
2010-11-26 22:06:34 -08:00
Melanie
35c6bba6d7
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:29:01 +00:00
Melanie
63e2c3b2d6
Reformat an overzealous comment. Remove end of line marks and reference to the
...
Mantis solved, as that isn't needed to understand the code. Reformat the
comment for 80 col screens.
2010-11-27 01:28:02 +00:00
Micheil Merlin
6ed63487d9
llUnsit position fix 4063 (updated 11-20-2010)
2010-11-27 02:05:44 +00:00
Micheil Merlin
a8a8fb6e13
llVecNorm nant test
2010-11-27 01:29:55 +00:00
Justin Clark-Casey (justincc)
e0866faacc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-27 01:27:46 +00:00
Melanie
a1ab2a2244
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:25:02 +00:00
Mic Bowman
541a7660e0
Refactor appearance and avatar data sending code. Paritioning the routines into "one-to-many" and "many-to-one" makes it possible to call the right function on presence creation (both child and root) and when a child agent is promoted to root. This brings the total number of appearance sends down to one or two on login.
...
Cleaned up the avatar update calls in the groups code. Cleaned up
some commented and debugging code, and a few formating fixes.
2010-11-27 01:14:36 +00:00
Melanie
e05f728b08
Merge branch 'master' into careminster-presence-refactor
2010-11-27 01:08:12 +00:00
Justin Clark-Casey (justincc)
0e311a2104
If we fail to gather asset uuids for a particular asset, log the failing asset id and type
2010-11-27 00:54:09 +00:00
Melanie
385a6c4b34
Convert the scope id in the im session id to a URL variable. Fixes offline
...
group notice attachments not working
2010-11-26 23:20:43 +01:00
Marck
7c02d5cec5
Another attempt at fixing failing test for creator info.
2010-11-26 23:04:31 +01:00
Marck
2827deffe8
Trigger changed event with CHANGED_TELEPORT when teleporting to another region.
2010-11-26 22:46:48 +01:00
Marck
0bc5ffbe96
Fix handling of landmarks for systems with culture settings other than en_US. This fixes Mantis #5177 .
2010-11-26 11:50:51 +01:00
Melanie
cccfd1db34
Add marker files to the restart module so external scripts can be used to
...
kill a process that hasn't restarted properly
2010-11-26 03:21:51 +01:00
Diva Canto
1cbd2842d5
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-25 16:27:19 -08:00
Melanie
33c023bf6a
Allow group lookup during tp / login to make restricting parcels to group
...
work.
2010-11-25 21:22:22 +01:00
Melanie
ee9aca9c52
Add the ability for gods to impersonate users. For this, bit 6 needs to be
...
set in the target's UserFlags and the impersonator must have UserLevel 200
or above. The user can then log in using the target's name and their own
password.
2010-11-25 20:34:55 +01:00
Diva Canto
ae4b02e115
WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
2010-11-25 11:14:16 -08:00
Melanie
2d2098f5da
Export the module interface for restart
2010-11-25 04:06:25 +00:00
Melanie
57c4def254
Change all restarting to use the restart module. Remove hardcoded behavior
2010-11-25 03:16:52 +00:00
Melanie
c14592d4ba
Export the module interface for restart
2010-11-25 04:16:34 +01:00
Melanie
efb03f6f99
Fix a bug caused by leftover code
2010-11-25 03:59:57 +01:00
Melanie
e74b0deb4e
Fix up remote controller.
2010-11-25 03:43:23 +00:00
Melanie
6c3eb21440
Merge branch 'master' into careminster-presence-refactor
2010-11-25 03:27:35 +00:00
Melanie
fb97fe8307
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:30:06 +00:00
Melanie
1522567920
Finish the RestartModule and fix some bugs. Add new console commands:
...
region restart bluebox <msg> <time> ...
region restart notice <msg> <time> ...
region restart abort [<message>]
2010-11-25 02:37:50 +01:00
Melanie
eb9d7bff6c
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-25 01:25:56 +00:00
Melanie
2c1c04119d
Merge branch 'master' into careminster-presence-refactor
2010-11-25 01:24:32 +00:00
Melanie
6734c9f83a
Implement the restart module
2010-11-25 01:22:05 +00:00
Melanie
e14f449cc2
Adding the skeleton for the restart module
2010-11-24 22:14:53 +00:00
Melanie
b3a71c6df1
Prevent an overlength button label from producing a debug dump and aborting
...
the script.
2010-11-24 18:56:25 +01:00
dahlia
9f29908f66
catch an exception when a mesh asset header cant be decoded
2010-11-24 02:05:41 -08:00
Jonathan Freedman
bc51dfc45e
Merge branch 'master-core' into mantis5110
2010-11-23 22:27:54 -08:00
Melanie
a47fb93b74
Prevent a dump in the llGetLinkKey method when using LINK_ROOT in a single prim
2010-11-23 23:48:52 +01:00
Diva Canto
a4bf6c5343
Attempt at fixing failing test.
2010-11-23 07:44:42 -08:00
Melanie
6557d5f359
Merge branch 'master' into careminster-presence-refactor
2010-11-23 14:05:09 +00:00
Melanie
2527aeb40c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-23 14:03:52 +00:00
Diva Canto
61a49ec4a8
Initialize InventoryItemBase.creatorData properly. Could throw.
2010-11-23 06:36:57 -08:00
Melanie
45b08a9ce3
Fix more potential nullrefs
2010-11-23 14:02:20 +00:00
Melanie
7796b90ebb
Fix some crashes caused by the addition of the CreatorData column
2010-11-23 14:02:06 +00:00
Marck
c68f03a6ff
Fix: Allow use of parameters without specifying a file path with command "save oar"
2010-11-23 11:45:12 +01:00
Marck
ba2bf78dcf
Fix joining land parcels not being stored correctly in SQLite. Thank you to goetz for the initial patch in Mantis #5230 .
2010-11-23 11:45:12 +01:00
Justin Clark-Casey (justincc)
8d79a39d5b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-23 04:27:06 +00:00
Justin Clark-Casey (justincc)
63170fdea7
Only perform the take object permissions check if an object is being attached directly from the scene, not from existing inventory
2010-11-23 04:26:07 +00:00
Melanie
4a54b3318b
Fix more potential nullrefs
2010-11-23 00:31:09 +01:00
Justin Clark-Casey (justincc)
bbc291dfdf
adapt tests to use DeRezObjects() since DeRezObject() has recently disappeared
2010-11-22 23:07:30 +00:00
Justin Clark-Casey (justincc)
34b13a4765
add basic tests to check that under default permissions module owner can delete objects and that non-owners (who are also not administrators, etc.) cannot
2010-11-22 22:54:13 +00:00
Melanie
571becefb6
Fix some crashes caused by the addition of the CreatorData column
2010-11-22 23:31:29 +01:00
Marck
e1c72cedb3
Let CHANGED_SCALE also trigger when editing prims and linksets with the viewer's edit tools.
...
This event used to trigger only when the scale was changed with a script.
2010-11-22 19:38:44 +01:00
Marck
d63965cf94
Let CHANGED_SHAPE trigger. This fixes Mantis #1844 .
2010-11-22 19:38:44 +01:00
Melanie
d2aebbe066
Fox case on a method
2010-11-22 14:27:45 +00:00
Melanie
506192e466
Make an invalud key string in llTextBox and llDialog non fatal to avoid
...
breakinf sloppily made no-mod scripted items.
2010-11-22 15:16:28 +01:00
Melanie
4e0a289a8d
Change FS Voice module to a shared module to avoid gratuitious server handler
...
registrations. Add the missing bits to drive the local connector's HTTP
requests. This makes standalones work.
2010-11-22 14:13:27 +00:00
Melanie
54d1d6d917
Fox case on a method
2010-11-22 14:32:51 +01:00
Melanie
87f30709a2
Merge branch 'master' into careminster-presence-refactor
2010-11-22 14:14:45 +00:00
Marck
8a2c365e5b
Thank you, thomax, for a patch making changed events CHANGED_REGION_RESTART and CHANGED_REGION work.
...
Fixes Mantix #5214 .
2010-11-22 10:39:46 +01:00
Jonathan Freedman
b7f5e82843
Merge branch 'master-core' into mantis5110
2010-11-21 20:01:48 -08:00
Jonathan Freedman
562147475c
Merge https://github.com/opensim/opensim into mantis5110
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
Melanie
22ff06ba17
Merge branch 'master' into careminster-presence-refactor
2010-11-22 01:09:26 +00:00
Melanie
8466ada8e0
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-11-22 00:46:37 +00:00
Diva Canto
0fec29c849
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-11-21 17:19:45 -08:00
Diva Canto
c617d658dd
Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.
...
New migration in inventory table in order to make CreatorID varchar(255).
2010-11-21 17:19:24 -08:00
Melanie
ddf08276f1
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:46:23 +00:00
Melanie
7e9a3019ac
Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not.
2010-11-22 00:55:11 +01:00
Melanie
8d7b181b58
Merge branch 'master' into careminster-presence-refactor
2010-11-21 23:47:28 +00:00
Melanie
c85e6bc36d
Add the remote connector for freeswitch config retrieval
2010-11-21 23:42:52 +00:00
Melanie
5f8a0f3d1f
Add the remote connector for freeswitch config retrieval
2010-11-21 23:41:56 +00:00
Melanie
2105842513
Finish the standalone mode freeswitch work and add config examples
2010-11-21 23:24:39 +00:00
Melanie
a7174cecdd
Remove username and password from the publicly accessible FS config
2010-11-21 22:45:04 +00:00
Melanie
6fa24f4671
Convert the Freeswitch module to new style
2010-11-21 22:40:03 +00:00
Melanie
e6c52f38c5
Strip the dialplan and directory methods from the region module
2010-11-21 22:25:50 +00:00
Melanie
2b0ef9ad1d
Implement a method to allow regions to query the gridwide Freeswitch
...
configuration from ROBUST
2010-11-21 22:17:25 +00:00
Diva Canto
af8c8197ab
Updated SQLiteLegacy/SQLiteSimulationData with the same. Is this crap still used?!?
2010-11-21 13:29:20 -08:00
Melanie
ed5f91c638
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:29:17 +00:00
Melanie
c0ccfeebe7
Start implementing Freeswitch in ROBUST
2010-11-21 21:29:11 +00:00
Diva Canto
51343caeb5
Updated SQLite/SQLiteSimulationData to use SOP.CreatorInformation instead of SOP.CreatorID. Untested, but should work.
2010-11-21 13:27:03 -08:00
Melanie
83a427a8f9
Move Dialplan and Directory from the region module to the ROBUST server
2010-11-21 21:18:03 +00:00
Diva Canto
6a9ae9e7cb
Global creator information working on MySQL DB and on load/save OARs. Creator name properly shown on the viewer as first.last @authority.
...
New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars.
Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
2010-11-21 13:16:52 -08:00
Melanie
1cf8eb8a90
Start implementing Freeswitch in ROBUST
2010-11-21 20:59:01 +00:00
Marck
f1151f20dc
Fix global region coordinates that are delivered by llRequestSimulatorData.
...
Also did some source code clean-up by replacing literals with constants.
2010-11-20 03:03:11 +00:00
Justin Clark-Casey (justincc)
a88bcbb118
Knock V0_2 decals off archive tests since they're misleading
2010-11-20 03:01:47 +00:00
Justin Clark-Casey (justincc)
d7bca3d8e8
Fix unit tests and save problems
...
(note; contrary to previous commits, saving 0.4 OARs is actually broken since serialized objects in inventories are not yet converted properly).
Firstly, if you can save a version 1.0 OAR then you can load it too.
Secondly, closing the save stream even on success before assets/objects are saved is a bad idea
2010-11-20 02:59:21 +00:00
Justin Clark-Casey (justincc)
1087d6042b
correct build break. for some reason, xbuild didn't rebuild test dlls
2010-11-20 02:43:38 +00: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
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
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
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
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
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
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
Melanie
390c3a3b6f
Prevent leftover attachments from clogging up the pipes
2010-11-16 22:18:35 +00: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
Marck
56bd42b438
Fix osTeleportAgent for hypergrid destinations.
...
Signed-off-by: Melanie <melanie@t-data.com>
2010-11-16 15:23:45 +00: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
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
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
Justin Clark-Casey (justincc)
1e7334d985
provide avatar name in log if an exception ends up at the top of an async packet processing stack
2010-11-12 23:20:07 +00:00
BlueWall
00b0f521fa
Add PARCEL_DETAILS_ID to LSL
2010-11-12 01:16:14 +00:00
Kitto Flora
b2aeea66e3
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-11 04:51:05 +00:00
Kitto Flora
9462a1861b
Fix excessive forward motion and flailing while descending a slope, prevent adding motion while falling from flying.
2010-11-11 04:49:47 +00:00
Melanie
bfc128529c
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:20:19 +00:00
Melanie
aace455249
Prevent teleporting to a region when the egent is banned in all parcels
2010-11-10 16:22:55 +01:00
Melanie
ff3e466000
Remove a debug spam
2010-11-10 01:17:40 +00:00
Melanie
846198bb9e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:55:43 +00:00
Melanie
b68f701c00
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-09 23:55:19 +00:00
Melanie
fa64f2e56e
Although the Allow Voice setting is per estate rather than per region,
...
apparently it is required in the region handshake to let the client
enable parcel voice controls. So, send it.
2010-11-09 23:54:08 +00:00
Melanie
ee85a530f6
Merge branch 'master' into careminster-presence-refactor
2010-11-09 22:16:48 +00:00
Melanie
22144eb8f7
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 22:15:59 +00:00
Melanie
d206721e2f
Add option SeeIntoBannedRegion to allow band to act like SL, where you can
...
see in but not enter. Defaults to false, so no change.
2010-11-09 22:41:40 +01:00
Melanie
dfe11566f4
Fix parcel bans to work only on the avatars they're supposed to work on instead of pushing all avatars, even the ones that are allowed.
2010-11-09 20:18:36 +01:00
Melanie
ccfbce3176
Remove "OpenSimulator" from startup message
2010-11-09 16:07:43 +01:00
Melanie
09ea73f7cc
Change "OpenSim" to "Careminster" and remove CM suffix.
2010-11-09 15:33:03 +01:00
Melanie
15da52d73a
Prevent temp-on-rez prims from being persisted
2010-11-08 19:00:03 +01:00
Jeff Ames
ae9c4a4d11
Formatting cleanup.
2010-11-08 07:48:35 -05:00
Melanie
df0787f5cf
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:08:02 +00:00
Melanie
798abd1508
Reinstate a lost fix
2010-11-08 03:06:58 +00:00
Melanie
8a97d58f09
Merge branch 'master' into careminster-presence-refactor
2010-11-08 03:05:07 +00:00
Melanie
6056ae8d88
Fix merge artefacts
2010-11-08 02:58:33 +00:00
Melanie
18b27408d6
Prevent plants from being treated like dropped attachments and removed
...
from the sim.
2010-11-08 02:39:06 +00:00
Melanie
4f6dd8bda3
Call the cleanup after saving attachment states, so that the attachments
...
don't get killed before they can be saved
2010-11-08 02:38:15 +00:00
Melanie
2f58d56137
Call the Cleanup when an agent logs out, when an agent leaves and just
...
before an agent logs in directly. Intentionally not calling this from MakeRoot
as that would mess up attachment transfer in teleport
2010-11-08 02:37:28 +00:00
Melanie Thielker
d8fffd0fb5
Call attachment cleanup when an agent crosses out
2010-11-08 02:37:00 +00:00
Melanie Thielker
2317b6767b
Add a method to delete left over / dropped attachments
2010-11-08 02:36:51 +00:00
Melanie
6585243113
Detach attachments displaced by other attachments
2010-11-08 02:35:47 +00:00
Melanie
5a3cd9f1d0
Decrease min search length to 2 chars for map search.
2010-11-07 16:08:41 +01:00
Jonathan Freedman
4f40374464
Merge git://github.com/opensim/opensim into mantis5110
2010-11-05 19:10:02 -07:00
Melanie
4db60a5a40
Fix the inventory transfer module to not cause duplicated text IMs
2010-11-05 15:24:08 +01:00
Melanie
7844872067
Fix merge artefacts
2010-11-05 14:46:13 +01:00
Melanie
644eb9fd7f
Fix playing sound from HUDs
2010-11-05 13:45:28 +00:00
Melanie
e078c57bf0
Fix attached sounds from HUDs erroneously being delivered to other avatars
2010-11-05 13:39:04 +00:00
Melanie
1c8d19d714
Delete existing presences for a user ID when they log in again.
...
WARNING!!! This changes a default. The old default is to allow multiple
presences, the new default disables this. As the feature currently has no users,
this should not present any difficulty and will alleviate the presence
issues somewhat.
2010-11-05 13:31:45 +00:00
Melanie
ddd3c6824a
Revert "Spin the AddNewClient process off into a new thread to avoid locking up the LLUDPServer (and therefore the entire scene)"
...
This reverts commit 40e05f4109
.
Conflicts:
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
2010-11-05 14:27:53 +01:00
Melanie
f985775962
Revert "Fix for hanging on "Connecting to region".. caused by packets being processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready."
...
This reverts commit 91b1d17e5b
.
Conflicts:
OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-11-05 14:27:14 +01:00
Melanie
6bac92db80
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-11-05 13:34:54 +00:00
Melanie
53d64f755a
Merge branch 'master' into careminster-presence-refactor
2010-11-05 13:33:58 +00:00
Melanie
893915ce0b
Fix child prims returning after being unlinked and deleted where the root is
...
not deleted
2010-11-04 21:09:59 +01:00
Melanie
82e534a029
Fix avatar to avatar inventory gives across servers
2010-11-04 19:07:43 +01:00
Melanie
b8924167e0
Fix creation of a duplicate physics actor on chained drag-copy operations,
...
the main cause for "ghost prims"
2010-11-04 10:37:39 +01:00