ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-06-02 16:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
20,818 Commits 5 Branches 94 Tags
a79bafaaaf3df2a0e1663bf9317ee53eb06db204
Commit Graph

2147 Commits

Author SHA1 Message Date
Melanie
8c0f1e9058 Add a corresponding method for items. HG v2 2012-03-28 02:10:07 +01:00
Melanie
710c14fb57 Add SendRemoveInventoryFolders which allows to remove one or more 
folders from the viewer's inventory view. For HG v2.0. More to come
 2012-03-28 01:49:06 +01:00
Melanie
4ab63bfe97 Typo fix 2012-03-28 02:33:15 +02:00
Melanie
caaf25c326 Merge branch 'master' into careminster 2012-03-28 02:56:31 +01:00
Melanie
300488f862 Merge branch 'master' into careminster 2012-03-28 02:46:54 +01:00
Melanie
b519cf6383 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Client/IClientInventory.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
 2012-03-28 02:20:40 +01:00
Melanie
2a8b9a47b2 Add SendRemoveInventoryFolders which allows to remove one or more 
folders from the viewer's inventory view. For HG v2.0. More to come
 2012-03-28 01:15:56 +02:00
Melanie
b18b1b1d70 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-27 23:14:43 +01:00
Snoopy Pfeffer
7223b63563 User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users. 2012-03-27 22:09:58 +02:00
Melanie
3381899481 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandObject.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2012-03-22 20:38:49 +00:00
Justin Clark-Casey (justincc)
1a8769e6ef Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead. 
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
 2012-03-21 23:57:39 +00:00
Justin Clark-Casey (justincc)
c39fba8f9d minor: remove some mono compiler warnings 2012-03-20 23:19:11 +00:00
Justin Clark-Casey (justincc)
30b2a8c778 Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy. 
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
 2012-03-20 23:12:21 +00:00
Melanie
35c3124c3b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2012-03-20 23:39:02 +00:00
UbitUmarov
efd7ff3146 add some more notifications about changes on physical parameters ( still incomple and there should be a better away ) 2012-03-20 16:46:16 +00:00
Melanie
618244f285 Remove debug output using Console.WriteLine and trim excessive whitespace 2012-03-19 14:39:19 +01:00
UbitUmarov
ae8e089b9c some more work on costs 2012-03-16 15:33:49 +00:00
UbitUmarov
15ad5f492b Playing with object costs CAPS ... 2012-03-15 10:25:18 +00:00
UbitUmarov
84ca09f7c5 added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change... 2012-03-15 02:24:13 +00:00
UbitUmarov
cf9ebd301c bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still 2012-03-14 18:24:04 +00:00
Melanie
d4e6834f99 Hook up the new cap to the SOP changes 2012-03-13 20:49:16 +01:00
Melanie
f53c322b7e Merge branch 'ubitwork' 2012-03-13 20:21:26 +01:00
Melanie
f415eb84e1 Implement the cap to send extra physics params to the viewer. Not functional 
yet because the parameters are not actually stored anywhere yet.
 2012-03-13 20:06:39 +01:00
UbitUmarov
3de3b9e63c initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc 2012-03-13 17:56:32 +00:00
Melanie
ebcd4910a2 Refactor, move OjectChangeData into it's own file and rename 
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
 2012-03-13 13:08:32 +01:00
UbitUmarov
b0f01cec98 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-03-11 03:57:59 +00:00
UbitUmarov
1f7c0c2ea0 cleanup + comments 2012-03-11 03:28:17 +00:00
Melanie
4f7ec1d691 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2012-03-11 01:55:36 +01:00
Melanie
f292e19689 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Application/OpenSimBase.cs
 2012-03-11 02:29:43 +00:00
UbitUmarov
908abb1c3d BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED **** 2012-03-10 20:32:19 +00:00
Justin Clark-Casey (justincc)
bdc968f1fc Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy. 
As per opensim-users mailing list discussion.
 2012-03-09 23:57:24 +00:00
Melanie
e1be1c5263 Merge branch 'ubitwork' 2012-03-09 02:11:25 +01:00
UbitUmarov
e5786ba043 more changes on undo/redo group scaling seems to work better 2012-03-09 02:56:14 +00:00
UbitUmarov
05cdf9bda9 more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken 2012-03-09 01:53:58 +00:00
Melanie
b0fc96c17d Merge branch 'master' into careminster 2012-03-08 19:10:22 +00:00
Justin Clark-Casey (justincc)
749c3fef8a Change "help" to display categories/module list then "help <category/module>" to display commands in a category. 
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
 2012-03-08 01:51:37 +00:00
Melanie
182f5efbe9 Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2012-03-04 16:23:46 +00:00
Melanie
6338996f87 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
 2012-03-04 16:23:19 +00:00
Justin Clark-Casey (justincc)
98ad6ed255 comment out "[CAPS]: ScriptTaskInventory Request" log spam 2012-03-02 23:29:35 +00:00
Melanie
37068d17c5 Merge branch 'master' into careminster 2012-02-24 09:56:06 +00:00
Justin Clark-Casey (justincc)
f67f37074f Stop spurious scene loop startup timeout alarms for scenes with many prims. 
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
 2012-02-24 05:02:33 +00:00
Melanie
1c0adfa6e0 Correct sit position calculations 2012-02-23 22:26:17 +01:00
Melanie
dc835717d6 Properly sequence updates of avatars and attachments so that we don't 
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
 2012-02-23 14:08:35 +01:00
Melanie
56cc573d2f Show avatars as sitting on proot prims only to avoid motion jitter 
for passengers
 2012-02-23 12:20:20 +01:00
Melanie
985526b662 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
 2012-02-18 22:21:10 +00:00
Justin Clark-Casey (justincc)
80ec2ac167 Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5 2012-02-16 01:39:12 +00:00
Justin Clark-Casey (justincc)
df960d5767 Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode() 2012-02-16 01:25:54 +00:00
Melanie
2d3381b795 Implement region crossing of sitting avatars. Edit mode and llSetPos work 
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
 2012-02-14 23:16:20 +01:00
Melanie
acfe7e555e Merge branch 'master' into careminster 2012-02-10 23:59:10 +00:00
PixelTomsen
a7dc7e636e Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879 
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
 2012-02-10 15:45:03 -05:00