Commit Graph

22210 Commits (a696253081a5e0c310e9d5a179bdeaae1dd7c477)

Author SHA1 Message Date
Melanie 839aa57b42 Update the example 2012-10-08 18:01:56 +01:00
Melanie ff92330523 Add a ServiceList section to Robust .ini to get rid of the long string 2012-10-08 17:57:22 +01:00
Melanie 90a39379f0 Allow other whitespace characters than spaces in Robust connection string 2012-10-08 17:36:40 +01:00
Melanie 8894f4ad77 Change permissions on child prim inventory items when god mode "force
permissive" is used.
2012-10-08 01:34:32 +02:00
ubit 2d2c4e3a86 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-08 00:55:44 +02:00
UbitUmarov a1fcfe8677 a few changes/fix (?) 2012-10-07 23:54:15 +01:00
ubit 398d92dc40 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 09:54:48 +02:00
UbitUmarov 48d8fbc9ae bug fix + make costs visible for testing 2012-10-07 08:53:55 +01:00
ubit 1af4d8b7f8 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 07:34:17 +02:00
UbitUmarov a0b4e68060 refix so we can compile it, loosing alpha scultps fix on core meshmerizer 2012-10-07 06:33:13 +01:00
UbitUmarov c42df1259f fix wrong file commited 2012-10-07 06:16:47 +01:00
UbitUmarov 03ef125ba0 Merge branch 'avination' into ubitwork
Conflicts:
	OpenSim/Region/Physics/Meshing/Meshmerizer.cs
2012-10-07 06:13:24 +01:00
UbitUmarov 4a87a8f3b9 comment out a spam coment on core Meshmerizer 2012-10-07 06:11:51 +01:00
UbitUmarov 4efc90ef37 i update core ode plugin and make it load is meshs (i hope) 2012-10-07 05:53:52 +01:00
Melanie 0c5b36a4f7 Merge branch 'avination' into careminster
Conflicts:
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 03:12:21 +01:00
Melanie 9be2d5c77d Fix merge issues 2012-10-07 03:03:24 +01:00
Melanie f7df68d922 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
ubit 7e1eecdf73 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-07 02:22:28 +02:00
UbitUmarov 78ce7a0a04 [DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
now
2012-10-07 01:20:52 +01:00
Justin Clark-Casey (justincc) 13c4fd7271 refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents 2012-10-06 04:06:27 +01:00
Justin Clark-Casey (justincc) 9de991301c Make UserSessionID a class rather than a struct, so that later updates to value suceed (rather than having to pull the data out and reinsert back into the Dictionary).
Fixes http://opensimulator.org/mantis/view.php?id=6338
2012-10-06 04:04:50 +01:00
Justin Clark-Casey (justincc) 16c9c1dff7 On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>".  Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
Dan Lake 91ca3117cb Add bool to TriggerSceneObjectPartUpdated where full = true indicates a full update. There should be a better way to indicate which properties have changed that is non LLUDP-centric 2012-10-05 17:32:07 -07:00
Dan Lake 6f220a8679 Trigger ObjectAddedToScene when loading objects from oarfile. Already triggers when creating, duplicating or loading from database, incoming attachments, etc 2012-10-05 17:30:27 -07:00
ubit ceb33b24f7 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-05 07:04:58 +02:00
UbitUmarov 5254c0de8f Merge branch 'avination' into ubitwork 2012-10-05 06:00:45 +01:00
Justin Clark-Casey (justincc) 1fb53e7103 Fix bug in implementation of "show part pos" that would not filter probably.
Also refactors more of ObjectCommandsModule to remove duplicate code
2012-10-05 04:31:43 +01:00
Justin Clark-Casey (justincc) 22f6fa49e3 Add "show part pos" console command to match "show object pos" 2012-10-05 04:22:08 +01:00
Justin Clark-Casey (justincc) 16feed456a refactor: eliminate some now duplicate code in ObjectCommandsModule 2012-10-05 04:16:38 +01:00
Justin Clark-Casey (justincc) 68859af3f8 Add Vector3.Zero return on TryParseConsoleVector() which fails on mono 2.4.3 but not mono 2.10.9 2012-10-05 03:58:52 +01:00
Justin Clark-Casey (justincc) 633e1ed62c Add missing ConsoleUtil from last commit 2012-10-05 03:57:35 +01:00
Justin Clark-Casey (justincc) 130768b16a Add "show object pos <start-coord> to <end-coord>" command to simulator console.
This allows you to display details of all objects in a given bounding box.
Values parts of the co-ord can be left out as appropriate (e.g. to get all objects between the ground and z=30.
See "help show object pos" for more details.
2012-10-05 03:52:42 +01:00
Justin Clark-Casey (justincc) 8cd1dc8d60 minor: Add missing license information from the top of IUserManagement 2012-10-05 02:07:28 +01:00
Justin Clark-Casey (justincc) d87813a194 Finally fix build break by allowing UserManagementModule (which constructs a packet directly) to reference OpenSim.Region.ClientStack.LindenUDP.
This time I actually properly did a clean build
2012-10-05 02:02:19 +01:00
Justin Clark-Casey (justincc) 046113c137 Print number of objects found with "show object name" and "show part name" simulator console commands 2012-10-05 01:46:28 +01:00
Justin Clark-Casey (justincc) 03136df1a7 Forgot to actually remove the packetpool set code from scene. 2012-10-05 01:45:49 +01:00
Justin Clark-Casey (justincc) 7c7cdf3431 Read PacketPool config in LLUDPServer with other config params rather than in Scene.
This is to resolve previous build break.
This unnecessarily but harmlessly reads and sets the parameter multiple times - scene was doing the same thing.
2012-10-05 01:43:29 +01:00
Justin Clark-Casey (justincc) 4832ed6960 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-05 01:32:02 +01:00
Justin Clark-Casey (justincc) f0178a6a41 refactor: Move OpenSim.Framework.PacketPool to OpenSim.Region.Clientstack.Linden.UDP
This is to allow it to use OpenSim.Framework.Monitoring in the future.
This is also a better location since the packet pool is linden udp specific
2012-10-05 01:12:56 +01:00
UbitUmarov db00402fa8 make sure a buffer is closed, and changed a misleading log msg 2012-10-05 00:14:49 +01:00
Diva Canto 276fdbc1b3 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2012-10-04 15:33:17 -07:00
Diva Canto 5b90f5bb17 One more abstraction for GridUser so that it can be overridden in a sub-class. 2012-10-04 15:32:49 -07:00
Melanie d5ea203f93 Fix threading in remote asset connector 2012-10-05 00:15:55 +02:00
Melanie 637e9a10db Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +01:00
Mic Bowman d98af79f77 Make the asset retrieval concurrency a config switch. The current value
of 30 is still hanging badly on some mono versions. The switch defaults to
30 to preserve current behavior.
2012-10-04 08:41:06 -07:00
Melanie b977f962fa Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
2012-10-04 15:42:52 +01:00
Melanie efb9b7014e Allow default animation to be stopped to be replaced with another one.
Fixes Mantis #6327
2012-10-04 15:20:04 +02:00
ubit 717802ab09 Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 09:16:21 +02:00
UbitUmarov 89d342b5ce more changes and more non active code 2012-10-04 08:14:52 +01:00
ubit 840d56dcec Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 2012-10-04 06:30:51 +02:00